From: <bar...@us...> - 2009-06-10 12:57:37
|
Revision: 48 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=48&view=rev Author: bartdedobbelaer Date: 2009-06-10 12:17:57 +0000 (Wed, 10 Jun 2009) Log Message: ----------- - Removed unnecessary data files - Adjusted the networks to make use of the demo data - Reduced data where applicable - Removed MoviePlayer (data too big and not relevant) Modified Paths: -------------- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/GUIPanel.png trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/MeVisLabSplash.png trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/OverlayViewer.png trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/autoPanel.png trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/ide.png trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/000_FirstNetwork.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/001b_MacroInternal.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/101_FirstNetwork.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/102_View2D.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/103_OrthoView2D.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104_Overlay.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/105_View3D.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/201_LocalImageInfo.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/206_Scale.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/212_Mask.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/301_Histogram.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/401_MarkerEditor.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/401b_RegionGrowing.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/402_CSOEditor.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/601_WEMIsoSurface.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/602_SoLUTEditor.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/slides Removed Paths: ------------- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/Bone.tiff trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/DTISubImg.dcm trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/DTISubImg.tif trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/Liver1_CT_venous.small.dcm trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/Liver1_CT_venous.small.tif trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/bone.wem trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/rotatingBrainAtlas.avi trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/003_ModuleInterfaces.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104b_OrthoOverlay.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/203_DicomImport.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/204_DicomTagViewer.mlab trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/208_Morphology.mlab Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/Bone.tiff =================================================================== (Binary files differ) Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/DTISubImg.dcm =================================================================== (Binary files differ) Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/DTISubImg.tif =================================================================== (Binary files differ) Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/GUIPanel.png =================================================================== (Binary files differ) Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/Liver1_CT_venous.small.dcm =================================================================== (Binary files differ) Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/Liver1_CT_venous.small.tif =================================================================== (Binary files differ) Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/MeVisLabSplash.png =================================================================== (Binary files differ) Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/OverlayViewer.png =================================================================== (Binary files differ) Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/autoPanel.png =================================================================== (Binary files differ) Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/bone.wem =================================================================== (Binary files differ) Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/ide.png =================================================================== (Binary files differ) Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/data/rotatingBrainAtlas.avi =================================================================== (Binary files differ) Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/000_FirstNetwork.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/000_FirstNetwork.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/000_FirstNetwork.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,10 +5,11 @@ module LocalImage { internal { frame = "617 357 96 56" + moduleGroupName = "" windows { window _default { - geometry = "697 468 492 211" - sizeHint = "492 211" + geometry = "697 468 458 242" + sizeHint = "458 242" wasOpen = no wasActive = no } @@ -16,23 +17,29 @@ } fields { instanceName = LocalImage - name = $(NETWORK)/../data/Bone.tiff - trueName = "I:/MeVisLab/Presentations/Tutorial Using MeVisLab/data/Bone.tiff" + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.0rcVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" } internalFields = "" } module View2D { internal { frame = "625 197 80 56" + moduleGroupName = "" } fields { instanceName = View2D inventorInputOn = FALSE view2DExtensionsOn = TRUE startSlice = -1 + numSlices = 1 + numXSlices = 1 + sliceStep = 1 slab = 1 blendMode = BLEND_REPLACE - timePoint = -1 + timePoint = 0 maxTimePoint = -1 filterMode = FILTER_LINEAR standardKeys = TRUE @@ -44,6 +51,7 @@ zoomMode = VIEW2D_AUTO_ZOOM unzoomOnImageChange = FALSE sliceZoom = 1 + sliceZoomSynced = 1 baseColor = "1 1 1" margin = "2 2" sliceOrigin = "0 0" @@ -53,13 +61,16 @@ annotationOn = TRUE annotationMode = ANNO_MODE_AUTO annotationSizeMode = ANNO_SHOW_DETAILED - annotationCol = "0.9 0.9 0.9" + annotationCol = "0.8999999761581421 0.8999999761581421 0.8999999761581421" annotationFontSize = ANNO_SIZE_AUTO annoCoords = Voxel annoCTValue = AsIs borderOn = TRUE - borderColor = "0.9 0.9 0.9" + borderColor = "0.8999999761581421 0.8999999761581421 0.8999999761581421" + valueHighPrecision = FALSE + plane = "0 0 1 0" } internalFields = "" } connections = "" +networkModel = "" Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/001b_MacroInternal.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/001b_MacroInternal.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/001b_MacroInternal.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,6 +5,7 @@ module SoGroup { internal { frame = "481 145 96 64" + moduleGroupName = "" } fields { instanceName = group @@ -13,6 +14,7 @@ module ContourManager { internal { frame = "409 417 128 64" + moduleGroupName = "" } fields { instanceName = cm @@ -80,6 +82,7 @@ module LiveWire { internal { frame = "581 377 104 64" + moduleGroupName = "" } fields { instanceName = lw @@ -136,3 +139,4 @@ group.children = "cm.outputInv lw.outputInv" lw.inputBaseContourManager = cm.outputBaseThis } +networkModel = "" Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/003_ModuleInterfaces.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/003_ModuleInterfaces.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/003_ModuleInterfaces.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -1,73 +0,0 @@ -// MDL v1 utf8 -network { - watchlist = "" -} -module SoWEMRenderer { - internal { - frame = "604 270 128 56" - windows { - window _default { - geometry = "857 244 337 404" - sizeHint = "337 404" - wasOpen = no - wasActive = no - } - window _automatic { - geometry = "211 265 274 440" - sizeHint = "274 440" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = SoWEMRenderer - renderCaching = AUTO - boundingBoxCaching = AUTO - renderCulling = AUTO - pickCulling = AUTO - autoApply = TRUE - autoUpdate = TRUE - autoClear = TRUE - useHighlightSelected = FALSE - usePolygonOffset = TRUE - useShapeHints = TRUE - parameterOverwriteMode = OVERWRITE_MODE_ALL - overwriteColorMode = FALSE - overwriteFaceParameters = FALSE - overwriteEdgeParameters = FALSE - overwriteNodeParameters = FALSE - overwriteBoundingBoxParameters = FALSE - colorMode = WEM_COLOR_GENERAL - drawFaces = TRUE - faceDiffuseColor = "0.792157 0.792157 0.792157" - useFaceAmbientColor = TRUE - faceAmbientColor = "0.266667 0.266667 0.266667" - useFaceSpecularColor = TRUE - faceSpecularColor = "0.066667 0.066667 0.066667" - drawEdges = FALSE - edgeColor = "0 0 0" - drawNodes = FALSE - nodeColor = "1 1 1" - drawBoundingBoxes = FALSE - boundingBoxColor = "1 1 1" - drawFaceNormals = FALSE - drawNodeNormals = FALSE - faceNormalColor = "1 1 1" - nodeNormalColor = "1 1 1" - faceNormalScaling = 1 - nodeNormalScaling = 1 - faceAlphaValue = 1 - faceShininessValue = 1 - lineWidth = 1 - pointSize = 1 - useEdgeColoringMode = FALSE - nodeRenderingMode = WEM_NODE_RENDERING_NORMAL - boundingBoxMode = WEM_BOUNDING_BOX_AXIS_ALIGNED - primitiveValueLists = "" - selectedPrimitiveValueList = "" - primitiveValueListValid = FALSE - selectedTab = 0 - } -} -connections = "" Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/101_FirstNetwork.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/101_FirstNetwork.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/101_FirstNetwork.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,10 +5,11 @@ module LocalImage { internal { frame = "617 357 96 56" + moduleGroupName = "" windows { window _default { - geometry = "697 468 492 211" - sizeHint = "492 211" + geometry = "697 468 458 242" + sizeHint = "458 242" wasOpen = no wasActive = no } @@ -16,20 +17,26 @@ } fields { instanceName = LocalImage - name = $(NETWORK)/../data/Bone.tiff - trueName = "D:/MeVisLab/Presentations/Tutorial Using MeVisLab/data/Bone.tiff" + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.0rcVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" } internalFields = "" } module View2D { internal { frame = "625 197 80 56" + moduleGroupName = "" } fields { instanceName = View2D inventorInputOn = FALSE view2DExtensionsOn = TRUE startSlice = 0 + numSlices = 1 + numXSlices = 1 + sliceStep = 1 slab = 1 blendMode = BLEND_REPLACE timePoint = 0 @@ -44,6 +51,7 @@ zoomMode = VIEW2D_AUTO_ZOOM unzoomOnImageChange = FALSE sliceZoom = 1 + sliceZoomSynced = 1 baseColor = "1 1 1" margin = "2 2" sliceOrigin = "0 0" @@ -53,15 +61,18 @@ annotationOn = TRUE annotationMode = ANNO_MODE_AUTO annotationSizeMode = ANNO_SHOW_DETAILED - annotationCol = "0.9 0.9 0.9" + annotationCol = "0.8999999761581421 0.8999999761581421 0.8999999761581421" annotationFontSize = ANNO_SIZE_AUTO annoCoords = Voxel annoCTValue = AsIs borderOn = TRUE - borderColor = "0.9 0.9 0.9" + borderColor = "0.8999999761581421 0.8999999761581421 0.8999999761581421" + valueHighPrecision = FALSE + plane = "0 0 1 0.5" } internalFields = "" } connections { View2D.inImage = LocalImage.outImage } +networkModel = "" Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/102_View2D.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/102_View2D.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/102_View2D.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,6 +5,7 @@ module SoGroup { internal { frame = "873 229 96 56" + moduleGroupName = "" } fields { instanceName = SoGroup1 @@ -13,14 +14,16 @@ module SoGroup { internal { frame = "561 229 96 56" + moduleGroupName = "" } fields { instanceName = SoGroup } } -module VoxValueRescale { +module VoxelValueRescale { internal { - frame = "785 393 128 64" + frame = "781 393 136 64" + moduleGroupName = "" } fields { instanceName = alphaRescale @@ -42,9 +45,10 @@ outputWidth = 1598 } } -module VoxValueRescale { +module VoxelValueRescale { internal { - frame = "929 393 128 64" + frame = "925 393 136 64" + moduleGroupName = "" } fields { instanceName = lutRescale @@ -69,6 +73,7 @@ module SoView2DVoxelValue { internal { frame = "613 321 152 64" + moduleGroupName = "" windows { window _default { geometry = "92 146 336 356" @@ -82,6 +87,7 @@ instanceName = annoReadPix drawingOn = TRUE editingOn = TRUE + maskValid = FALSE fixZOn = TRUE color = "1 1 1" selectionTolerance = 4 @@ -95,13 +101,15 @@ wantsAllEvents = FALSE wantsKeyEvents = FALSE wantsMouseWheelEvents = FALSE + setEventHandled = FALSE + ignoreHandledEvents = FALSE createNewMode = FALSE renderOnSlab = FALSE clipToSlice = FALSE cursorShape = UNDEFINED_CURSOR - voxelPosition = "4.3376 42.4757 11.5" + voxelPosition = "4.337600231170654 42.47570037841797 11.5" integerPosition = "4 42 11" - worldPosition = "4.3376 42.4757 11.5" + worldPosition = "4.337600231170654 42.47570037841797 11.5" storedValue = 841 outputValue = 841 storedValueString = 841 @@ -111,6 +119,7 @@ module SoView2DAnnotation { internal { frame = "453 321 152 64" + moduleGroupName = "" windows { window _default { geometry = "393 225 424 408" @@ -124,8 +133,9 @@ instanceName = annotation drawingOn = TRUE editingOn = TRUE + maskValid = FALSE fixZOn = TRUE - color = "0.9 0.9 0.9" + color = "0.8999999761581421 0.8999999761581421 0.8999999761581421" selectionTolerance = 4 needsValidVoxel = TRUE button1 = IGNORED @@ -137,6 +147,8 @@ wantsAllEvents = FALSE wantsKeyEvents = TRUE wantsMouseWheelEvents = FALSE + setEventHandled = FALSE + ignoreHandledEvents = FALSE createNewMode = FALSE renderOnSlab = FALSE clipToSlice = FALSE @@ -223,11 +235,20 @@ input07 = 1085 input08 = 1598 input09 = HU + fontWidthDummyString = "" + targetWidth = 0 + targetHeight = 0 + drawBackgroundBox = FALSE + backgroundColor = "0.2000000029802322 0.2000000029802322 0.699999988079071" + backgroundOpacity = 0.5 + backgroundEdgeColor = "0.2000000029802322 0.2000000029802322 0.699999988079071" + backgroundEdgeOpacity = 0.5 } } module SoView2DSliceShift { internal { frame = "1025 169 144 64" + moduleGroupName = "" windows { window _default { geometry = "26 59 364 209" @@ -241,6 +262,7 @@ instanceName = sliceShift drawingOn = TRUE editingOn = TRUE + maskValid = FALSE fixZOn = TRUE color = "1 1 1" selectionTolerance = 4 @@ -254,17 +276,21 @@ wantsAllEvents = FALSE wantsKeyEvents = FALSE wantsMouseWheelEvents = FALSE + setEventHandled = FALSE + ignoreHandledEvents = FALSE createNewMode = FALSE renderOnSlab = FALSE clipToSlice = FALSE cursorShape = MOVE_ALL_CURSOR editX = TRUE editY = TRUE + evalStarted = FALSE } } module SoView2DSliceZoom { internal { frame = "1089 265 144 64" + moduleGroupName = "" windows { window _default { geometry = "158 233 364 259" @@ -278,6 +304,7 @@ instanceName = sliceZoom drawingOn = TRUE editingOn = TRUE + maskValid = FALSE fixZOn = TRUE color = "1 1 1" selectionTolerance = 4 @@ -291,6 +318,8 @@ wantsAllEvents = FALSE wantsKeyEvents = TRUE wantsMouseWheelEvents = FALSE + setEventHandled = TRUE + ignoreHandledEvents = FALSE createNewMode = FALSE renderOnSlab = FALSE clipToSlice = FALSE @@ -299,11 +328,13 @@ max = 100 sensitivity = 100.9049988 dragMode = DRAG_TAKE_AND_PUSH + evalStarted = FALSE } } module SoMouseGrabber { internal { frame = "929 321 128 64" + moduleGroupName = "" windows { window _default { geometry = "136 204 497 416" @@ -316,6 +347,8 @@ fields { instanceName = lutMouseGrabber on = TRUE + normalized = FALSE + clamp = TRUE button1 = IGNORED button2 = IGNORED button3 = PRESSED @@ -329,13 +362,20 @@ ctrlPressed = FALSE altPressed = FALSE cursorShape = LUT_CURSOR - x = 1597.560059 - y = 1085.300049 + absX = 0 + absY = 0 + y = 1085 + x = 1598 + y = 1085 xmin = 0 xmax = 4095 ymin = 0 ymax = 4095 + cursorPresent = FALSE + checkCursorPresent = FALSE maskValid = FALSE + setEventHandled = FALSE + setWheelEventHandled = FALSE flipX = FALSE flipY = TRUE swapXY = FALSE @@ -350,6 +390,7 @@ module SoRLLookUpTable { internal { frame = "781 321 136 64" + moduleGroupName = "" } fields { instanceName = lut @@ -375,8 +416,8 @@ widthMin = 0 enableNegWidth = FALSE widthMax = 4095 - rangeStep = 10 - rangeStepStep = 100 + rangeStep = 10.00000095 + rangeStepStep = 100.0000076 selectorX = 0 selectorY = 0 setInputMinMax = TRUE @@ -385,43 +426,43 @@ trCol0 = "1 1 1" trCol0Name = White trCol0Alpha = 1 - trCol1 = "0.501961 0.501961 0.501961" + trCol1 = "0.5019609928131104 0.5019609928131104 0.5019609928131104" trCol1Name = Grey trCol1Alpha = 1 - trCol2 = "0.862745 0 0.172549" + trCol2 = "0.8627449870109558 0 0.1725489944219589" trCol2Name = Red trCol2Alpha = 1 - trCol3 = "1 0.462745 0.490196" + trCol3 = "1 0.4627450108528137 0.4901959896087646" trCol3Name = "Light Red" trCol3Alpha = 1 - trCol4 = "0 0.819608 0.160784" + trCol4 = "0 0.8196079730987549 0.1607840061187744" trCol4Name = Green trCol4Alpha = 1 - trCol5 = "0.5607839999999999 1 0.435294" + trCol5 = "0.5607839822769165 1 0.4352940022945404" trCol5Name = "Light Green" trCol5Alpha = 1 - trCol6 = "0.184314 0.239216 0.929412" + trCol6 = "0.1843139976263046 0.2392159998416901 0.9294120073318481" trCol6Name = Blue trCol6Alpha = 1 - trCol7 = "0.490196 0.541176 1" + trCol7 = "0.4901959896087646 0.5411760210990906 1" trCol7Name = "Light Blue" trCol7Alpha = 1 - trCol8 = "0.631373 0 0.678431" + trCol8 = "0.6313729882240295 0 0.67843097448349" trCol8Name = "Dark Magenta" trCol8Alpha = 1 - trCol9 = "0.894118 0.380392 1" + trCol9 = "0.8941180109977722 0.3803919851779938 1" trCol9Name = Magenta trCol9Alpha = 1 - trColA = "0 0.682353 0.756863" + trColA = "0 0.6823530197143555 0.756862998008728" trColAName = "Dark Cyan" trColAAlpha = 1 - trColB = "0.501961 1 0.980392" + trColB = "0.5019609928131104 1 0.9803919792175293" trColBName = Cyan trColBAlpha = 1 - trColC = "0.615686 0.6 0.196078" + trColC = "0.6156859993934631 0.6000000238418579 0.1960780024528503" trColCName = "Dark Yellow" trColCAlpha = 1 - trColD = "1 0.976471 0.368627" + trColD = "1 0.9764710068702698 0.3686270117759705" trColDName = Yellow trColDAlpha = 1 trColE = "1 1 1" @@ -435,11 +476,13 @@ module SoView2DSlicer { internal { frame = "1181 169 120 64" + moduleGroupName = "" } fields { instanceName = slicer drawingOn = TRUE editingOn = TRUE + maskValid = FALSE fixZOn = TRUE color = "1 1 1" selectionTolerance = 4 @@ -453,20 +496,24 @@ wantsAllEvents = FALSE wantsKeyEvents = FALSE wantsMouseWheelEvents = TRUE + setEventHandled = FALSE + ignoreHandledEvents = FALSE createNewMode = FALSE renderOnSlab = FALSE clipToSlice = FALSE cursorShape = MOVE_INOUT_CURSOR sensitivity = 0.5 + permitInteractionOutsideImage = FALSE } } module LocalImage { internal { frame = "1129 493 96 56" + moduleGroupName = "" windows { window _default { - geometry = "397 436 492 211" - sizeHint = "492 211" + geometry = "397 436 458 242" + sizeHint = "458 242" wasOpen = no wasActive = no } @@ -474,14 +521,17 @@ } fields { instanceName = LocalImage - name = $(NETWORK)/../data/Bone.tiff - trueName = "I:/MeVisLab/Presentations/Tutorial Using MeVisLab/data/Bone.tiff" + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.0rcVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" } internalFields = "" } module SoView2D { internal { frame = "1333 221 88 56" + moduleGroupName = "" windows { window _default { geometry = "410 200 466 687" @@ -498,14 +548,17 @@ numSlices = 1 numXSlices = 1 maxSlice = 63 + keepSlicesInView = FALSE slab = 1 lowerLeft = "0 0" upperRight = "1 1" margin = "2 2" spacing = "4 4" + plane = "0 0 1 11.5" sliceZoom = 1 + sliceZoomSynchronized = 1 minSliceZoomKeyboard = 1 - sliceOrigin = "0.163682 0.982096" + sliceOrigin = "0.1636819988489151 0.9820960164070129" viewingCenter = "0 0 0" enableViewingCenter = FALSE unzoomOnImageChange = FALSE @@ -516,6 +569,8 @@ standardKeys = TRUE standardKeysNumbers = TRUE standardKeysNeedValidPosition = FALSE + passHandledFlagToInventor = FALSE + reverseExtensionDrawingOrder = FALSE blendMode = BLEND_REPLACE filterMode = FILTER_LINEAR cacheMode = SLICE_CACHING_OFF @@ -556,6 +611,7 @@ module SoRenderArea { internal { frame = "1009 -19 112 56" + moduleGroupName = "" windows { window _viewer { geometry = "1334 220 400 400" @@ -623,3 +679,4 @@ SoView2D.image = LocalImage.outImage SoRenderArea.children = SoView2D.self } +networkModel = "" Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/103_OrthoView2D.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/103_OrthoView2D.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/103_OrthoView2D.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,6 +5,7 @@ module SoView2DPosition { internal { frame = "453 189 136 56" + moduleGroupName = "" windows { window _default { geometry = "721 234 483 576" @@ -18,8 +19,9 @@ instanceName = SoView2DPosition drawingOn = TRUE editingOn = TRUE + maskValid = FALSE fixZOn = TRUE - color = "1 0.666667 0" + color = "1 0.6666669845581055 0" selectionTolerance = 4 needsValidVoxel = TRUE button1 = PRESSED @@ -31,18 +33,23 @@ wantsAllEvents = FALSE wantsKeyEvents = FALSE wantsMouseWheelEvents = FALSE + setEventHandled = FALSE + ignoreHandledEvents = FALSE createNewMode = FALSE renderOnSlab = FALSE clipToSlice = FALSE cursorShape = UNDEFINED_CURSOR - worldPosition = "32 36.5874 35.5" - firstSliceWorldPosition = "32 36.5874 35.5" + worldPosition = "32 36.58739852905273 35.5" + firstSliceWorldPosition = "32 36.58739852905273 35.5" + drawingModel = DRAWINGMODEL_CROSSHAIRS + drawingModelSize = -1 blendOnto = 1 blendOutside = 0 + lineWidth = 1 colorAxes = FALSE sagittalColor = "1 0 0" - coronalColor = "0.172549 0.886275 0.0117647" - axialColor = "0.00784314 0.952941 0.968627" + coronalColor = "0.1725489944219589 0.8862749934196472 0.01176469959318638" + axialColor = "0.007843139581382275 0.9529410004615784 0.9686269760131836" updateOnPress = TRUE updateOnMotion = TRUE updateOnRelease = FALSE @@ -54,6 +61,7 @@ module SoRenderArea { internal { frame = "457 61 128 56" + moduleGroupName = "" windows { window _viewer { geometry = "38 206 695 585" @@ -92,6 +100,7 @@ module View2DExtensions { internal { frame = "309 189 136 56" + moduleGroupName = "" } fields { instanceName = View2DExtensions @@ -99,7 +108,7 @@ zoomOn = TRUE panOn = TRUE autoCenterOn = TRUE - position = "5.15521 -57.6365 8.02908" + position = "5.155210018157959 -57.63650131225586 8.029080390930176" positionMode = Off lutOn = TRUE lutMouseOn = TRUE @@ -123,29 +132,30 @@ lutEnableNegWidth = FALSE lutSetDefaultOnce = FALSE lutTrCol0 = "1 1 1" - lutTrCol1 = "0.501961 0.501961 0.501961" - lutTrCol2 = "0.862745 0 0.172549" - lutTrCol3 = "1 0.462745 0.490196" - lutTrCol4 = "0 0.819608 0.160784" - lutTrCol5 = "0.5607839999999999 1 0.435294" - lutTrCol6 = "0.184314 0.239216 0.929412" - lutTrCol7 = "0.490196 0.541176 1" - lutTrCol8 = "0.631373 0 0.678431" - lutTrCol9 = "0.894118 0.380392 1" - lutTrColA = "0 0.682353 0.756863" - lutTrColB = "0.501961 1 0.980392" - lutTrColC = "0.615686 0.6 0.196078" - lutTrColD = "1 0.976471 0.368627" + lutTrCol1 = "0.5019609928131104 0.5019609928131104 0.5019609928131104" + lutTrCol2 = "0.8627449870109558 0 0.1725489944219589" + lutTrCol3 = "1 0.4627450108528137 0.4901959896087646" + lutTrCol4 = "0 0.8196079730987549 0.1607840061187744" + lutTrCol5 = "0.5607839822769165 1 0.4352940022945404" + lutTrCol6 = "0.1843139976263046 0.2392159998416901 0.9294120073318481" + lutTrCol7 = "0.4901959896087646 0.5411760210990906 1" + lutTrCol8 = "0.6313729882240295 0 0.67843097448349" + lutTrCol9 = "0.8941180109977722 0.3803919851779938 1" + lutTrColA = "0 0.6823530197143555 0.756862998008728" + lutTrColB = "0.5019609928131104 1 0.9803919792175293" + lutTrColC = "0.6156859993934631 0.6000000238418579 0.1960780024528503" + lutTrColD = "1 0.9764710068702698 0.3686270117759705" lutTrColE = "1 1 1" lutTrColF = "1 1 1" annotationOn = TRUE annoCoords = Voxel annoCTValue = ToHounsfield + valueHighPrecision = FALSE annotFontSize = ANNO_SIZE_AUTO annotShowOrientation = ANNO_ORIENTATION_SIZE_WEIGHTED annotVerticalRuler = TRUE annotHorizontalRuler = FALSE - annotationCol = "0.9 0.9 0.9" + annotationCol = "0.8999999761581421 0.8999999761581421 0.8999999761581421" annotationMode = ANNO_MODE_AUTO annotShowAnnot = ANNO_SHOW_DETAILED annotUserTopLeft = "$(PatientsName) @@ -172,27 +182,29 @@ annotShortBottomRight = "LUT C/W: $(input03) / $(input04)" annoInput03 = 921.4 annoInput04 = 1024 - annoInput05 = 921.4000244 + annoInput05 = 921.4000244140625 annoInput06 = 1024 - annoInput07 = 921.4000244 + annoInput07 = 921.4000244140625 annoInput08 = 1024 annoInput09 = HU annoMouseOn = TRUE annoReadPixFloorPos = "58 28 35" - annoReadPixVoxelPos = "58.6294 28.5315 35.5" - annoReadPixWorldPos = "58.6294 28.5315 35.5" + annoReadPixVoxelPos = "58.62939834594727 28.5314998626709 35.5" + annoReadPixWorldPos = "58.62939834594727 28.5314998626709 35.5" borderOn = TRUE - borderColor = "0.9 0.9 0.9" + borderColor = "0.8999999761581421 0.8999999761581421 0.8999999761581421" borderWidth = 1 borderEvaluateFocus = FALSE borderFocusColor = "1 1 1" borderFocusWidth = 2 + mouseGrabberMode = FALSE } internalFields = "" } module SoOrthoView2D { internal { frame = "605 189 120 56" + moduleGroupName = "" windows { window _default { geometry = "765 214 389 595" @@ -208,7 +220,7 @@ boundingBoxCaching = AUTO renderCulling = AUTO pickCulling = AUTO - worldPosition = "32 36.5874 35.5" + worldPosition = "32 36.58739852905273 35.5" blendMode = BLEND_REPLACE filterMode = FILTER_LINEAR lutMode = LUT_BEST @@ -226,6 +238,7 @@ sliceOrigin2 = "0 0" sliceOrigin3 = "0 0" synchronizePanning = FALSE + keepSlicesInView = FALSE viewingCenter = "-1 -1 -1" viewingCenter1 = "31.5 32 32" viewingCenter2 = "32 36.5 32" @@ -234,7 +247,7 @@ extraViewSpace = TRUE extraViewLowerLeft = "0 0.5" extraViewUpperRight = "0.5 1" - extraViewSize = "0.666 0.666" + extraViewSize = "0.6660000085830688 0.6660000085830688" margin = "2 2" alternCubeLayout = FALSE cacheMode = SLICE_CACHING_OFF @@ -266,10 +279,11 @@ module LocalImage { internal { frame = "489 333 96 56" + moduleGroupName = "" windows { window _default { - geometry = "397 436 492 211" - sizeHint = "492 211" + geometry = "397 436 458 242" + sizeHint = "458 242" wasOpen = no wasActive = no } @@ -277,8 +291,10 @@ } fields { instanceName = LocalImage - name = $(NETWORK)/../data/Bone.tiff - trueName = "I:/MeVisLab/Presentations/Tutorial Using MeVisLab/data/Bone.tiff" + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.0rcVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" } internalFields = "" } @@ -289,3 +305,4 @@ SoOrthoView2D.inputImage = LocalImage.outImage SoOrthoView2D.worldPosition = SoView2DPosition.worldPosition } +networkModel = "" Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104_Overlay.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104_Overlay.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104_Overlay.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,6 +5,7 @@ module View2D { internal { frame = "757 133 120 56" + moduleGroupName = "" windows { window _default { geometry = "543 441 200 200" @@ -19,6 +20,9 @@ inventorInputOn = TRUE view2DExtensionsOn = TRUE startSlice = 0 + numSlices = 1 + numXSlices = 1 + sliceStep = 1 slab = 1 blendMode = BLEND_REPLACE timePoint = 0 @@ -33,6 +37,7 @@ zoomMode = VIEW2D_AUTO_ZOOM unzoomOnImageChange = FALSE sliceZoom = 1 + sliceZoomSynced = 1 baseColor = "1 1 1" margin = "2 2" sliceOrigin = "0 0" @@ -42,18 +47,21 @@ annotationOn = TRUE annotationMode = ANNO_MODE_AUTO annotationSizeMode = ANNO_SHOW_DETAILED - annotationCol = "0.9 0.9 0.9" + annotationCol = "0.8999999761581421 0.8999999761581421 0.8999999761581421" annotationFontSize = ANNO_SIZE_AUTO annoCoords = Voxel annoCTValue = AsIs borderOn = TRUE - borderColor = "0.9 0.9 0.9" + borderColor = "0.8999999761581421 0.8999999761581421 0.8999999761581421" + valueHighPrecision = FALSE + plane = "0 0 1 0.5" } internalFields = "" } module Threshold { internal { frame = "845 333 88 56" + moduleGroupName = "" windows { window _default { geometry = "507 466 273 94" @@ -74,10 +82,11 @@ module LocalImage { internal { frame = "737 429 96 56" + moduleGroupName = "" windows { window _default { - geometry = "682 618 492 211" - sizeHint = "492 211" + geometry = "682 618 458 242" + sizeHint = "458 242" wasOpen = no wasActive = no } @@ -85,14 +94,17 @@ } fields { instanceName = LocalImage - name = $(NETWORK)/../data/Bone.tiff - trueName = "D:/MeVisLab/Presentations/Tutorial Using MeVisLab/data/Bone.tiff" + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.0rcVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" } internalFields = "" } module SoView2DOverlay { internal { frame = "821 245 136 56" + moduleGroupName = "" windows { window _default { geometry = "335 509 486 349" @@ -106,6 +118,7 @@ instanceName = SoView2DOverlay drawingOn = TRUE editingOn = TRUE + maskValid = FALSE fixZOn = TRUE color = "1 1 1" selectionTolerance = 4 @@ -119,6 +132,8 @@ wantsAllEvents = TRUE wantsKeyEvents = TRUE wantsMouseWheelEvents = FALSE + setEventHandled = FALSE + ignoreHandledEvents = FALSE createNewMode = FALSE renderOnSlab = TRUE clipToSlice = TRUE @@ -130,7 +145,7 @@ filterMode = FILTER_LINEAR inheritFilterMode = TRUE alphaFactor = 0.5 - baseColor = "1 0.666667 0" + baseColor = "1 0.6666669845581055 0" useWorldCoords = TRUE applyLut = TRUE isCheckerTiling = FALSE @@ -144,3 +159,4 @@ Threshold.input0 = LocalImage.outImage SoView2DOverlay.image = Threshold.output0 } +networkModel = "" Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104b_OrthoOverlay.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104b_OrthoOverlay.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/104b_OrthoOverlay.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -1,478 +0,0 @@ -// MDL v1 utf8 -network { - watchlist = "" -} -module SoGroup { - internal { - frame = "569 141 128 56" - } - fields { - instanceName = SoGroup - } -} -module SoView2DOverlay { - internal { - frame = "725 253 136 56" - windows { - window _default { - geometry = "335 509 486 349" - sizeHint = "486 349" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = SoView2DOverlay2 - drawingOn = TRUE - editingOn = TRUE - fixZOn = TRUE - color = "1 1 1" - selectionTolerance = 4 - needsValidVoxel = TRUE - button1 = IGNORED - button2 = IGNORED - button3 = IGNORED - shift = IGNORED - control = IGNORED - alt = IGNORED - wantsAllEvents = TRUE - wantsKeyEvents = TRUE - wantsMouseWheelEvents = FALSE - createNewMode = FALSE - renderOnSlab = TRUE - clipToSlice = TRUE - cursorShape = UNDEFINED_CURSOR - cacheTextures = TRUE - blendMode = BLEND_BLEND - timePoint = 0 - maxTimePoint = 0 - filterMode = FILTER_LINEAR - inheritFilterMode = TRUE - alphaFactor = 0.5 - baseColor = "1 0.666667 0" - useWorldCoords = TRUE - applyLut = TRUE - isCheckerTiling = FALSE - checkerTileSize = 2 - areCheckerTilesInverted = FALSE - } -} -module SoView2DOverlay { - internal { - frame = "581 253 136 56" - windows { - window _default { - geometry = "335 509 486 349" - sizeHint = "486 349" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = SoView2DOverlay1 - drawingOn = TRUE - editingOn = TRUE - fixZOn = TRUE - color = "1 1 1" - selectionTolerance = 4 - needsValidVoxel = TRUE - button1 = IGNORED - button2 = IGNORED - button3 = IGNORED - shift = IGNORED - control = IGNORED - alt = IGNORED - wantsAllEvents = TRUE - wantsKeyEvents = TRUE - wantsMouseWheelEvents = FALSE - createNewMode = FALSE - renderOnSlab = TRUE - clipToSlice = TRUE - cursorShape = UNDEFINED_CURSOR - cacheTextures = TRUE - blendMode = BLEND_BLEND - timePoint = 0 - maxTimePoint = 0 - filterMode = FILTER_LINEAR - inheritFilterMode = TRUE - alphaFactor = 0.5 - baseColor = "1 0.666667 0" - useWorldCoords = TRUE - applyLut = TRUE - isCheckerTiling = FALSE - checkerTileSize = 2 - areCheckerTilesInverted = FALSE - } -} -module OrthoReformat3 { - internal { - frame = "597 333 120 56" - } - fields { - instanceName = OrthoReformat3 - useGlobalInputImage = TRUE - } -} -module SoView2DPosition { - internal { - frame = "709 141 136 56" - windows { - window _default { - geometry = "210 270 483 576" - sizeHint = "483 576" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = SoView2DPosition - drawingOn = TRUE - editingOn = TRUE - fixZOn = TRUE - color = "1 0.666667 0" - selectionTolerance = 4 - needsValidVoxel = TRUE - button1 = PRESSED - button2 = IGNORED - button3 = IGNORED - shift = IGNORED - control = IGNORED - alt = IGNORED - wantsAllEvents = FALSE - wantsKeyEvents = FALSE - wantsMouseWheelEvents = FALSE - createNewMode = FALSE - renderOnSlab = FALSE - clipToSlice = FALSE - cursorShape = UNDEFINED_CURSOR - worldPosition = "31.5 39.5 32.5" - firstSliceWorldPosition = "31.0904 39.5245 32.5" - blendOnto = 1 - blendOutside = 0 - colorAxes = FALSE - sagittalColor = "1 0 0" - coronalColor = "0.172549 0.886275 0.0117647" - axialColor = "0.00784314 0.952941 0.968627" - updateOnPress = TRUE - updateOnMotion = TRUE - updateOnRelease = FALSE - cooperative = FALSE - colorBorder = FALSE - colorBorderWidth = 2 - } -} -module View2DExtensions { - internal { - frame = "421 141 136 56" - } - fields { - instanceName = View2DExtensions - slicerOn = TRUE - zoomOn = TRUE - panOn = TRUE - autoCenterOn = TRUE - position = "5.15521 -57.6365 8.02908" - positionMode = Off - lutOn = TRUE - lutMouseOn = TRUE - lutMouseButton1 = IGNORED - lutMouseButton2 = IGNORED - lutMouseButton3 = PRESSED - lutMouseShift = RELEASED - lutMouseCtrl = RELEASED - lutRangeMin = 0 - lutRangeMax = 4095 - lutAlphaSync = TRUE - lutGreyCenter = 1054 - lutGreyWidth = 706.4000244 - lutAlphaCenter = 1054 - lutAlphaWidth = 706.4000244 - lutColorFactor = "1 1 1" - lutAlphaFactor = 1 - lutAutoDefault = FALSE - lutSetInputMinMax = TRUE - lutUseTraceColors = FALSE - lutEnableNegWidth = FALSE - lutSetDefaultOnce = FALSE - lutTrCol0 = "1 1 1" - lutTrCol1 = "0.501961 0.501961 0.501961" - lutTrCol2 = "0.862745 0 0.172549" - lutTrCol3 = "1 0.462745 0.490196" - lutTrCol4 = "0 0.819608 0.160784" - lutTrCol5 = "0.5607839999999999 1 0.435294" - lutTrCol6 = "0.184314 0.239216 0.929412" - lutTrCol7 = "0.490196 0.541176 1" - lutTrCol8 = "0.631373 0 0.678431" - lutTrCol9 = "0.894118 0.380392 1" - lutTrColA = "0 0.682353 0.756863" - lutTrColB = "0.501961 1 0.980392" - lutTrColC = "0.615686 0.6 0.196078" - lutTrColD = "1 0.976471 0.368627" - lutTrColE = "1 1 1" - lutTrColF = "1 1 1" - annotationOn = TRUE - annoCoords = Voxel - annoCTValue = ToHounsfield - annotFontSize = ANNO_SIZE_AUTO - annotShowOrientation = ANNO_ORIENTATION_SIZE_WEIGHTED - annotVerticalRuler = TRUE - annotHorizontalRuler = FALSE - annotationCol = "0.9 0.9 0.9" - annotationMode = ANNO_MODE_AUTO - annotShowAnnot = ANNO_SHOW_DETAILED - annotUserTopLeft = "$(PatientsName) -$(PatientID) $(PatientsSex) -$(PatientsBirthDate) -($(input00)): $(input01) GV" - annotUserTopRight = "$(InstitutionName) -$(ManufacturersModelName) -$(Modality)" - annotUserBottomLeft = "Slice: $(slice) -Timepoint: $(timepoint) -$(sizex),$(sizey),$(sizez),$(sizec),$(sizet) -$(voxelx),$(voxely),$(voxelz) -$(SeriesDescription) -$(ImageComments)" - annotUserBottomRight = "User Mode -Scan: $(AcquisitionDate) -LUT C/W: $(input03) / $(input04)" - annotShortTopLeft = "$(PatientsName) -($(input00)): - $(input01) GV" - annotShortTopRight = $(Modality) - annotShortBottomLeft = "Slice: $(slice)" - annotShortBottomRight = "LUT C/W: $(input03) / $(input04)" - annoInput03 = 1054 - annoInput04 = 706.4 - annoInput05 = 1054 - annoInput06 = 706.4000244 - annoInput07 = 1054 - annoInput08 = 706.4000244 - annoInput09 = HU - annoMouseOn = TRUE - annoReadPixFloorPos = "6 46 32" - annoReadPixVoxelPos = "6.28424 46.1395 32.5" - annoReadPixWorldPos = "6.28424 46.1395 32.5" - borderOn = TRUE - borderColor = "0.9 0.9 0.9" - borderWidth = 1 - borderEvaluateFocus = FALSE - borderFocusColor = "1 1 1" - borderFocusWidth = 2 - } - internalFields = "" -} -module SoRenderArea { - internal { - frame = "637 21 152 56" - windows { - window _viewer { - geometry = "1336 307 400 400" - sizeHint = "400 400" - wasOpen = yes - wasActive = no - } - } - } - fields { - instanceName = SoRenderArea - renderCaching = AUTO - boundingBoxCaching = AUTO - renderCulling = AUTO - pickCulling = AUTO - border = FALSE - background = "0 0 0" - transparency = BLEND - antialiasing = FALSE - antialiasingNumPasses = 1 - grabKeyFocus = TRUE - snapshotFormat = SNAPSHOT_RGB - outputAviFile = "" - autoRedrawWhenRecording = TRUE - frameRate = 7 - frameRateAvi = 15 - status = ready - outputSnapshotFile = none - outputSnapshotFileWritten = none - autoIncreaseFile = TRUE - autoUpdateML = FALSE - showSnapshotWithShell = FALSE - snapCount = 0 - } -} -module SoOrthoView2D { - internal { - frame = "861 141 120 56" - windows { - window _default { - geometry = "869 261 389 595" - sizeHint = "389 595" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = SoOrthoView2D - renderCaching = AUTO - boundingBoxCaching = AUTO - renderCulling = AUTO - pickCulling = AUTO - worldPosition = "31.5 39.5 32.5" - blendMode = BLEND_REPLACE - filterMode = FILTER_LINEAR - lutMode = LUT_BEST - slab = 1 - layoutMode = LAYOUT_CUBE_EQUAL - worldPosSticky = FALSE - snapToCenter = FALSE - drawImageData = TRUE - alphaFactor = 1 - baseColor = "1 1 1" - synchronizeZoom = TRUE - sliceZoom = 1 - minSliceZoomKeyboard = 1 - sliceOrigin1 = "0 0" - sliceOrigin2 = "0 0" - sliceOrigin3 = "0 0" - synchronizePanning = FALSE - viewingCenter = "-1 -1 -1" - viewingCenter1 = "31.5 32 32" - viewingCenter2 = "32 39.5 32" - viewingCenter3 = "32 32 32.5" - invertKeyPanningDirections = FALSE - extraViewSpace = TRUE - extraViewLowerLeft = "0 0.5" - extraViewUpperRight = "0.5 1" - extraViewSize = "0.666 0.666" - margin = "2 2" - alternCubeLayout = FALSE - cacheMode = SLICE_CACHING_OFF - timePoint = 0 - maxTimePoint = 0 - status = "Nothing active" - zoomMode = VIEW2D_AUTO_ZOOM - zoomModeParameter = 1 - sliceStep1 = 1 - sliceStep2 = 1 - sliceStep3 = 1 - numSlices1 = 1 - numSlices2 = 1 - numSlices3 = 1 - numXSlices1 = 1 - numXSlices2 = 1 - numXSlices3 = 1 - synchronizeFilterMode = TRUE - cineCenterT = 0 - cineIntervalT = 0 - cineDirection = CINE_PINGPONG - cineRepeat = CINE_ONCE - cineSpeed = 0.1000000015 - cineFullRangeT = TRUE - cineAlwaysReset = TRUE - useGlobalInputImage = TRUE - } -} -module Threshold { - internal { - frame = "613 429 88 56" - windows { - window _default { - geometry = "507 466 273 94" - sizeHint = "273 94" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = Threshold - threshold = 1200 - minValue = 0 - maxValue = 4095 - relativeThreshold = FALSE - } -} -module LocalImage { - internal { - frame = "737 429 96 56" - windows { - window _default { - geometry = "397 436 492 211" - sizeHint = "492 211" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = LocalImage - name = $(NETWORK)/../data/Bone.tiff - trueName = "D:/MeVisLab/Presentations/Tutorial Using MeVisLab/data/Bone.tiff" - } - internalFields = "" -} -module SoView2DOverlay { - internal { - frame = "445 253 136 56" - windows { - window _default { - geometry = "335 509 486 349" - sizeHint = "486 349" - wasOpen = no - wasActive = no - } - } - } - fields { - instanceName = SoView2DOverlay - drawingOn = TRUE - editingOn = TRUE - fixZOn = TRUE - color = "1 1 1" - selectionTolerance = 4 - needsValidVoxel = TRUE - button1 = IGNORED - button2 = IGNORED - button3 = IGNORED - shift = IGNORED - control = IGNORED - alt = IGNORED - wantsAllEvents = TRUE - wantsKeyEvents = TRUE - wantsMouseWheelEvents = FALSE - createNewMode = FALSE - renderOnSlab = TRUE - clipToSlice = TRUE - cursorShape = UNDEFINED_CURSOR - cacheTextures = TRUE - blendMode = BLEND_BLEND - timePoint = 0 - maxTimePoint = 0 - filterMode = FILTER_LINEAR - inheritFilterMode = TRUE - alphaFactor = 0.5 - baseColor = "1 0.666667 0" - useWorldCoords = TRUE - applyLut = TRUE - isCheckerTiling = FALSE - checkerTileSize = 2 - areCheckerTilesInverted = FALSE - } -} -connections { - SoGroup.children = "SoView2DOverlay.self SoView2DOverlay1.self SoView2DOverlay2.self" - SoView2DOverlay2.image = OrthoReformat3.output2 - SoView2DOverlay1.image = OrthoReformat3.output1 - OrthoReformat3.input0 = Threshold.output0 - SoView2DPosition.worldPosition = SoOrthoView2D.worldPosition - View2DExtensions.inLUT = LocalImage.outImage - SoRenderArea.children = "View2DExtensions.outNode SoGroup.self SoView2DPosition.self SoOrthoView2D.self" - SoOrthoView2D.inputImage = LocalImage.outImage - SoOrthoView2D.worldPosition = SoView2DPosition.worldPosition - Threshold.input0 = LocalImage.outImage - SoView2DOverlay.image = OrthoReformat3.output0 -} Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/105_View3D.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/105_View3D.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/105_View3D.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,6 +5,7 @@ module SoMouseGrabber { internal { frame = "633 301 128 56" + moduleGroupName = "" windows { window _default { geometry = "29 51 497 416" @@ -17,6 +18,8 @@ fields { instanceName = SoMouseGrabber on = TRUE + normalized = FALSE + clamp = TRUE button1 = IGNORED button2 = IGNORED button3 = PRESSED @@ -30,13 +33,20 @@ ctrlPressed = FALSE altPressed = FALSE cursorShape = LUT_CURSOR + absX = 0 + absY = 0 + y = 0.4699999988 x = 0.4499999881 y = 0.4699999988 xmin = 0 xmax = 1 ymin = 0 ymax = 1 + cursorPresent = FALSE + checkCursorPresent = FALSE maskValid = FALSE + setEventHandled = FALSE + setWheelEventHandled = FALSE flipX = FALSE flipY = TRUE swapXY = FALSE @@ -51,6 +61,7 @@ module SoExaminerViewer { internal { frame = "653 109 152 56" + moduleGroupName = "" windows { window _viewer { geometry = "763 251 400 400" @@ -115,9 +126,11 @@ cursor = TRUE isCameraStored = TRUE perspective = TRUE + stereoViewing = FALSE + stereoOffset = 3 height = 0.7853980064 - position = "-56.3173 -24.8778 118.22" - orientation = "-0.383949 -0.192596 0.903045 3.33537" + position = "-56.31729888916016 -24.87779998779297 118.2200012207031" + orientation = "-0.3839489221572876 -0.192595973610878 0.9030448198318481 3.335370063781738" nearDistance = 80.4776001 farDistance = 191.4329987 focalDistance = 135.8999939 @@ -140,6 +153,7 @@ module SoBackground { internal { frame = "241 237 112 56" + moduleGroupName = "" } fields { instanceName = SoBackground @@ -152,6 +166,7 @@ module SoRLLookUpTable { internal { frame = "629 389 136 56" + moduleGroupName = "" windows { window _default { geometry = "128 547 601 553" @@ -195,43 +210,43 @@ trCol0 = "1 1 1" trCol0Name = White trCol0Alpha = 1 - trCol1 = "0.501961 0.501961 0.501961" + trCol1 = "0.5019609928131104 0.5019609928131104 0.5019609928131104" trCol1Name = Grey trCol1Alpha = 1 - trCol2 = "0.862745 0 0.172549" + trCol2 = "0.8627449870109558 0 0.1725489944219589" trCol2Name = Red trCol2Alpha = 1 - trCol3 = "1 0.462745 0.490196" + trCol3 = "1 0.4627450108528137 0.4901959896087646" trCol3Name = "Light Red" trCol3Alpha = 1 - trCol4 = "0 0.819608 0.160784" + trCol4 = "0 0.8196079730987549 0.1607840061187744" trCol4Name = Green trCol4Alpha = 1 - trCol5 = "0.5607839999999999 1 0.435294" + trCol5 = "0.5607839822769165 1 0.4352940022945404" trCol5Name = "Light Green" trCol5Alpha = 1 - trCol6 = "0.184314 0.239216 0.929412" + trCol6 = "0.1843139976263046 0.2392159998416901 0.9294120073318481" trCol6Name = Blue trCol6Alpha = 1 - trCol7 = "0.490196 0.541176 1" + trCol7 = "0.4901959896087646 0.5411760210990906 1" trCol7Name = "Light Blue" trCol7Alpha = 1 - trCol8 = "0.631373 0 0.678431" + trCol8 = "0.6313729882240295 0 0.67843097448349" trCol8Name = "Dark Magenta" trCol8Alpha = 1 - trCol9 = "0.894118 0.380392 1" + trCol9 = "0.8941180109977722 0.3803919851779938 1" trCol9Name = Magenta trCol9Alpha = 1 - trColA = "0 0.682353 0.756863" + trColA = "0 0.6823530197143555 0.756862998008728" trColAName = "Dark Cyan" trColAAlpha = 1 - trColB = "0.501961 1 0.980392" + trColB = "0.5019609928131104 1 0.9803919792175293" trColBName = Cyan trColBAlpha = 1 - trColC = "0.615686 0.6 0.196078" + trColC = "0.6156859993934631 0.6000000238418579 0.1960780024528503" trColCName = "Dark Yellow" trColCAlpha = 1 - trColD = "1 0.976471 0.368627" + trColD = "1 0.9764710068702698 0.3686270117759705" trColDName = Yellow trColDAlpha = 1 trColE = "1 1 1" @@ -242,9 +257,10 @@ trColFAlpha = 0 } } -module SoGVRVolRen { +module SoGVRVolumeRenderer { internal { - frame = "953 237 112 56" + frame = "925 233 168 64" + moduleGroupName = "" windows { window _default { geometry = "96 137 416 574" @@ -266,17 +282,42 @@ staticQuality = 1 interactiveSamplingRate = 1 staticSamplingRate = 1 - renderMode = Direct blendMode = Blend octreeNodeSize = NODE_SIZE_32 octreeParentComputationMethod = Rank octreeParentComputationRank = 4 - gradientQuality = GradientQualityAutomatic currentTimePoint = 0 maxTimePoint = 0 force8bit = FALSE filterVolumeData = FilterLinear filterLut = TRUE + subVolumeStartX = 0 + subVolumeStartY = 0 + subVolumeStartZ = 0 + subVolumeEndX = 64 + subVolumeEndY = 64 + subVolumeEndZ = 64 + zbuffer = TRUE + permitClipping = TRUE + drawOnPlanes = TRUE + sizeOutputX = 64 + sizeOutputY = 64 + sizeOutputZ = 64 + incrementalUpdate = TRUE + highQualityStaticUpdate = FALSE + staticRenderingAfterInteractionOnly = FALSE + adaptQualityToWindowSize = TRUE + renderMode = Direct + useImageCacheFile = FALSE + imageCacheFilename = "" + greyCenter = 0.5 + greyWidth = 0.5 + greyInvert = FALSE + alphaCenter = 0.5 + alphaWidth = 0.5 + alphaInvert = FALSE + colorFactor = "1 1 1" + alphaFactor = 1 enhancementAlphaMix = 0.25 boundaryEnhancement = FALSE boundaryEnhancementFactor = 1 @@ -286,8 +327,8 @@ silhouetteEnhancementExponent = 1 silhouetteEnhancementFactor = 1 toneShading = FALSE - toneShadingWarmColor = "0.6745100000000001 0.5333329999999999 0.141176" - toneShadingColdColor = "0 0 0.4" + toneShadingWarmColor = "0.6745100021362305 0.5333330035209656 0.1411760002374649" + toneShadingColdColor = "0 0 0.4000000059604645" toneShadingWarmDiffuse = 0.6000000238 toneShadingColdDiffuse = 0.200000003 toneShadingAngle = 45 @@ -313,46 +354,22 @@ light3Color = "1 1 1" light3PolarPhi = -45 light3PolarRho = 0 - check3DTextureSupport = TRUE - subVolumeStartX = 0 - subVolumeStartY = 0 - subVolumeStartZ = 0 - subVolumeEndX = 64 - subVolumeEndY = 64 - subVolumeEndZ = 64 + gradientQuality = GradientQualityAutomatic selectionAlphaThreshold = 0.200000003 selectedPoint1 = "-1 -1 -1" selectedWorldPoint1 = "-1 -1 -1" selectionActive = FALSE - zbuffer = TRUE - permitClipping = TRUE useWorldCoords = TRUE - greyCenter = 0.5 - greyWidth = 0.5 - greyInvert = FALSE - alphaCenter = 0.5 - alphaWidth = 0.5 - alphaInvert = FALSE - colorFactor = "1 1 1" - alphaFactor = 1 - sizeOutputX = 64 - sizeOutputY = 64 - sizeOutputZ = 64 - useImageCacheFile = FALSE - imageCacheFilename = "" - incrementalUpdate = TRUE - highQualityStaticUpdate = FALSE - staticRenderingAfterInteractionOnly = FALSE - adaptQualityToWindowSize = TRUE } } module LocalImage { internal { frame = "609 557 96 56" + moduleGroupName = "" windows { window _default { - geometry = "397 436 492 211" - sizeHint = "492 211" + geometry = "397 436 458 242" + sizeHint = "458 242" wasOpen = no wasActive = no } @@ -360,8 +377,10 @@ } fields { instanceName = LocalImage - name = $(NETWORK)/../data/Bone.tiff - trueName = D:/MeVisLab/MLabModules/Presentations/MTUsingMeVisLab/data/Bone.tiff + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.0rcVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" } internalFields = "" } @@ -373,3 +392,4 @@ SoRLLookUpTable.greyWidth = SoMouseGrabber.x SoGVRVolRen.image = LocalImage.outImage } +networkModel = "" Modified: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/201_LocalImageInfo.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/201_LocalImageInfo.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/201_LocalImageInfo.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -5,10 +5,11 @@ module LocalImage { internal { frame = "1313 621 96 56" + moduleGroupName = "" windows { window _default { - geometry = "61 574 492 211" - sizeHint = "492 211" + geometry = "61 574 458 242" + sizeHint = "458 242" wasOpen = no wasActive = no } @@ -16,18 +17,21 @@ } fields { instanceName = LocalImage - name = $(NETWORK)/../data/DTISubImg.dcm - trueName = "D:/MeVisLab/Presentations/Tutorial Using MeVisLab/data/DTISubImg.dcm" + name = $(DemoDataPath)/DTISubImg.dcm + trueName = "C:/Program Files (x86)/MeVisLab2.0rcVC8-64/Packages/MeVisLab/Resources/DemoData/DTISubImg.dcm" + autoLoad = TRUE + status = "File open" } internalFields = "" } module Info { internal { frame = "1333 509 56 56" + moduleGroupName = "" windows { window _default { - geometry = "-4 295 564 371" - sizeHint = "564 371" + geometry = "-4 295 564 385" + sizeHint = "564 385" wasOpen = yes wasActive = no } @@ -35,14 +39,12 @@ } fields { instanceName = Info - pagedImgInfo = MLOk - memoryImage = "Invalid, (0,0,0,0,0,0)=0 Voxel at (0,0,0,0,0,0), " - memoryImage2 = "handled by host" - moduleName = ImgLoad - connectionValid = TRUE - dataValid = TRUE + pagedImgInfo = Ok + bypassIndex = -1 + inPlaceIndex = -1 } } connections { Info.input0 = LocalImage.outImage } +networkModel = "" Deleted: trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/203_DicomImport.mlab =================================================================== --- trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/203_DicomImport.mlab 2009-06-10 12:07:38 UTC (rev 47) +++ trunk/Community/General/Modules/Macros/PresentationBuilder/Presentations/Tutorial/macros/203_DicomImport.mlab 2009-06-10 12:17:57 UTC (rev 48) @@ -1,101 +0,0 @@ -// MDL v1 utf8 -network { - watchlist = "" -} -module View2D { - internal { - frame = "881 221 80 56" - windows { - window _de... [truncated message content] |