Menu
▾
▴
mevislabmodules-svn — Maillist for commits
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(144) |
Jul
(5) |
Aug
(23) |
Sep
(3) |
Oct
(8) |
Nov
(6) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(4) |
Feb
|
Mar
(34) |
Apr
(1) |
May
(10) |
Jun
(12) |
Jul
(17) |
Aug
(28) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(4) |
Feb
(7) |
Mar
(5) |
Apr
(1) |
May
|
Jun
(15) |
Jul
(1) |
Aug
(7) |
Sep
(9) |
Oct
(3) |
Nov
|
Dec
(1) |
| 2012 |
Jan
(1) |
Feb
(13) |
Mar
(6) |
Apr
|
May
(1) |
Jun
|
Jul
(1) |
Aug
(9) |
Sep
(7) |
Oct
(2) |
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <awa...@us...> - 2013-01-03 20:03:12
|
Revision: 429
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=429&view=rev
Author: awakeideas
Date: 2013-01-03 20:02:55 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
project update to build again
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Headers
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/OsiriXAPI
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Resources
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AdvancedQuerySubview.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AllKeyImagesArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Analyze.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Anonymization.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AnonymizationCustomTagPanelController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AnonymizationPanelController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AnonymizationSavePanelController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AnonymizationTagsPopUpButton.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AnonymizationTagsView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AnonymizationTemplateNamePanelController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AnonymizationViewController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AppController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AppControllerDCMTKCategory.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AppDelegate.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/AsyncSocket.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BLAuthentication.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BioradHeader.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BonjourBrowser.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BonjourPublisher.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BrowserController+Activity.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BrowserControllerDCMTKCategory.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BrowserMatrix.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/BurnerWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ButtonAndTextCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ButtonAndTextField.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CLUTOpacityView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRClusterView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRCurvedPath.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRDisplayInfo.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRGenerator.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRGeneratorOperation.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRGeneratorRequest.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRHorizontalFillOperation.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRMPRDCMView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRProjectionOperation.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRStraightenedOperation.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRTransverseView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRUnsignedInt16ImageRep.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CPRVolumeData.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CSMailMailClient.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CalciumScoringWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Camera.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Centerline.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ColorTransferView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ColorView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CurveFitter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/CurvedMPR.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMCalendarScript.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMCursor.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMObjectDBImport.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMObjectPixelDataImport.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMPix.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKImageQueryNode.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKPrintSCU.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKQueryNode.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKQueryRetrieveSCP.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKRootQueryNode.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKSeriesQueryNode.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKServiceClassUser.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKStoreSCU.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKStudyQueryNode.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMTKVerifySCU.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DCMView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DDData.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DDKeychain.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DDNumber.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DDRange.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DICOMExport.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DICOMTLS.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DICOMToNSString.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DNDArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DarkBox.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DarkPanel.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DarkWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DefaultsOsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomAlbum.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomCompressor.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomDatabase.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomDirParser.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomFileDCMTKCategory.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomImage.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomImageDCMTKCategory.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomSeries.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DicomStudy.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DiscBurningOptions.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DragMatrix.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/DragMatrixWithDelete.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/EndoscopyFlyThruController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/EndoscopyMPRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/EndoscopySegmentationController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/EndoscopyVRController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/EndoscopyVRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/EndoscopyViewer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/FVTiff.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/FlyAssistant.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/FlyThru.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/FlyThruAdapter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/FlyThruController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/FlyThruStepsArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/FlyThruTableView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/GLString.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HTTPAsyncFileResponse.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HTTPAuthenticationRequest.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HTTPConnection.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HTTPResponse.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HTTPServer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HangingProtocolController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HistoView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HistogramWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/HornRegistration.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/IChatTheatreDelegate.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/IChatTheatreHelpWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ISO8601DateFormatter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ITK.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ITKBrushROIFilter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ITKSegmentation3D.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ITKSegmentation3DController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ITKTransform.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ImageAndTextCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Interpolation3D.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/JPEGExif.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/KFSplitView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/KeyObjectController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/KeyObjectPopupController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/KeyObjectReport.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLDCMView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLMPRController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLMPRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLMPRViewer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLScoutOrthogonalReslice.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLScoutView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLScoutViewer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LLSubtraction.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LogArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LogManager.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LogTableView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LogWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LoupeController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LoupeView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/LoupeWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MPR2DController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MPR2DView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MPRController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MPRDCMView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MPRFinalView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MPRPerpendicularView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MPRPreviewView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MSRGSegmentation.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Mailer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MenuDictionary.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MoveManager.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MutableArrayCategory.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MyNSTextView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MyOutlineView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/MyPoint.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2AdaptiveBox.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Alignment.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Button.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2ButtonCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2CSV.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2CellDescriptor.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2ColorWell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2ColumnLayout.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Connection.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2ConnectionListener.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2CustomTitledPopUpButtonCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Debug.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2DisclosureBox.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2DisclosureButtonCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Exceptions.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2FlippedView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2HexadecimalNumberFormatter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2HighlightImageButtonCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2ImageButtonCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2ImageView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Layout.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2ManagedDatabase.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2MinMax.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Operators.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Pair.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Panel.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2PopUpButton.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2RedundantWebServiceClient.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Resizer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2SOAPWebServiceClient.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Shell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2SingletonObject.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Step.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2StepView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Steps.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2StepsView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Task.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2TextField.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2UserDefaults.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2View.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2WSDL.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2WebServiceClient.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2Window.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2XMLRPC.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2XMLRPCConnection.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N2XMLRPCWebServiceClient.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N3BezierCore.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N3BezierCoreAdditions.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N3BezierPath.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/N3Geometry.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NS(Attributed)String+Geometrics.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSAppleEventDescriptor+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSAppleScript+HandlerCalls.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSBitmapImageRep+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSButton+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSColor+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSData+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSDictionary+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSError+OsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSException+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSFileManager+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSFullScreenWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSImage+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSImage+OsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSImageView+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSInvocation+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSManagedObject+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSMutableDictionary+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSMutableString+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSPanel+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSPreferencePane+OsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSSplitViewSave.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSString+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSTextView+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSThread+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSURL+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSUserDefaults+OsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSUserDefaultsController+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSUserDefaultsController+OsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSView+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSWindow+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NSXMLNode+N2.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NavigatorView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NavigatorWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/NetworkMoveDataHandler.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Notifications.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OSIVoxel.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OSIWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OSIWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OpacityTransferView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OpenGLScreenReader.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OrthogonalMPRController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OrthogonalMPRPETCTController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OrthogonalMPRPETCTView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OrthogonalMPRPETCTViewer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OrthogonalMPRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OrthogonalMPRViewer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OrthogonalReslice.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OsiriXFixedPointVolumeRayCastMapper.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OsiriXSCPDataHandler.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/OsiriXToolbar.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PMDICOMStoreSCU.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PSGenerator.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PaletteController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PathForImage.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PieChartImage.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Piecewise3D.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PlaceholderWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PlotView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PlotWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PluginFileFormatDecoder.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PluginFilter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PluginManager.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PluginManagerController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Point3D.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PreferencesView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PreferencesWindowController+DCMTK.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PreferencesWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/PreviewView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/QTExportHTMLSummary.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/QueryArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/QueryController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/QueryFilter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/QueryLogController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/QueryOutlineView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/QuicktimeExport.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROI.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROIDefaultsWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROIManagerController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROIVolume.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROIVolumeController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROIVolumeManagerController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROIVolumeView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ROIWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ReportPluginFilter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Reports.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SFAuthorizationView+OsiriX.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRAnnotation.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRController+StereoVision.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRFlyThruAdapter+StereoVision.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRFlyThruAdapter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRView+StereoVision.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SSCrypto.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Schedulable.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Scheduler.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Scripting_Additions.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SearchSubview.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SearchWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SelectedKeyImagesArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SelectionView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SendController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SeriesView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ShadingArrayController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SimplePing.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SmartWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/SplashScreen.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Spline3D.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/StaticScheduler.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/StringTexture.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/StructuredReport.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/StructuredReportController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/StudyView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Survey.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/TCPServer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThickSlabController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThickSlabVR.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThreadCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThreadModalForWindowController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThreadPerConnectionServer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThreadPoolServer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThreadsManager.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThreeDPanView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThreeDPositionController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ThumbnailCell.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ToolBarNSWindow.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ToolbarPanel.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRController+StereoVision.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRControllerVPRO.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRFlyThruAdapter+StereoVision.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRFlyThruAdapter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRMakeObject.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRPROFlyThruAdapter.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRPresetPreview.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRView+StereoVision.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VRViewVPRO.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VTKStereoSRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VTKStereoVRView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/VTKView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/ViewerController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Wait.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WaitRendering.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortal+Databases.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortal+Email+Log.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortal.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortalConnection+Data.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortalConnection.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortalDatabase.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortalResponse.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortalSession.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortalStudy.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WebPortalUser.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Window3DController+StereoVision.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/Window3DController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/WindowLayoutManager.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/XMLController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/XMLControllerDCMTKCategory.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/XMLRPCMethods.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/altivecFunctions.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/basicHTTPServer.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/browserController.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/dicomData.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/dicomFile.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/iPhoto.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/printView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/sourcesTableView.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/stringAdditions.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/stringNumericCompare.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/vtkFixedPointVolumeRayCastMapper.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Headers/vtkPowerCrustSurfaceReconstruction.h
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/OsiriXAPI
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Resources/
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/A/Resources/Info.plist
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriXAPI.framework/Versions/Current
Removed Paths:
-------------
trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/
Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.h
===================================================================
--- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.h 2012-10-17 09:42:45 UTC (rev 428)
+++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.h 2013-01-03 20:02:55 UTC (rev 429)
@@ -7,8 +7,8 @@
//
#import <Cocoa/Cocoa.h>
-#import "DCMPix.h"
-#import "DCMView.h"
+#import <OsiriXAPI/DCMPix.h>
+#import <OsiriXAPI/DCMView.h>
@interface CMIVDCMView : DCMView {
NSSlider* tranlateSlider;
Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.h
===================================================================
--- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.h 2012-10-17 09:42:45 UTC (rev 428)
+++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.h 2013-01-03 20:02:55 UTC (rev 429)
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#import "ConfigCoreDataDelegate.h"
-#import "PluginFilter.h"
+#import <OsiriXAPI/PluginFilter.h>
#import "OsiriX2MeVisLabTBridge.h"
#import "CMIVDCMView.h"
Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.h
===================================================================
--- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.h 2012-10-17 09:42:45 UTC (rev 428)
+++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.h 2013-01-03 20:02:55 UTC (rev 429)
@@ -7,7 +7,7 @@
//
#import <Foundation/Foundation.h>
-#import "PluginFilter.h"
+#import <OsiriXAPI/PluginFilter.h>
#import "MeVisHubWindowController.h"
@interface MeVisLabHub : PluginFilter {
Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj
===================================================================
--- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj 2012-10-17 09:42:45 UTC (rev 428)
+++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj 2013-01-03 20:02:55 UTC (rev 429)
@@ -12,16 +12,11 @@
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
ABA48A650680BB600089EB4F /* MeVisLabHub.h in Headers */ = {isa = PBXBuildFile; fileRef = ABA48A640680BB600089EB4F /* MeVisLabHub.h */; };
ABA48A670680BB690089EB4F /* MeVisLabHub.m in Sources */ = {isa = PBXBuildFile; fileRef = ABA48A660680BB690089EB4F /* MeVisLabHub.m */; };
- ABB76340067FB2A8000912C1 /* DCMPix.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB76339067FB2A8000912C1 /* DCMPix.h */; };
- ABB76342067FB2A8000912C1 /* dicomFile.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB7633B067FB2A8000912C1 /* dicomFile.h */; };
- ABB76343067FB2A8000912C1 /* MyPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB7633C067FB2A8000912C1 /* MyPoint.h */; };
- ABB76344067FB2A8000912C1 /* PluginFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB7633D067FB2A8000912C1 /* PluginFilter.h */; };
- ABB76345067FB2A8000912C1 /* ROI.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB7633E067FB2A8000912C1 /* ROI.h */; };
- ABB76346067FB2A8000912C1 /* ViewerController.h in Headers */ = {isa = PBXBuildFile; fileRef = ABB7633F067FB2A8000912C1 /* ViewerController.h */; };
B70FD53410398B300094B238 /* MeVisLabHub.osirixplugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = AB5D36050680E57E00F4007A /* MeVisLabHub.osirixplugin */; };
B7350C091042F3F900705C92 /* MeVisLabScriptingBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = B7350C071042F3F900705C92 /* MeVisLabScriptingBridge.h */; };
B7350C0A1042F3F900705C92 /* MeVisLabScriptingBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = B7350C081042F3F900705C92 /* MeVisLabScriptingBridge.m */; };
B7350C151042F77700705C92 /* MeVisLab.h in Headers */ = {isa = PBXBuildFile; fileRef = B7350C141042F77700705C92 /* MeVisLab.h */; };
+ B790D13C169616D500E0CD74 /* OsiriXAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B790D13B169616D500E0CD74 /* OsiriXAPI.framework */; };
B9146099103359E4005BDFCF /* Length.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B914608C103359E3005BDFCF /* Length.tiff */; };
B914609A103359E4005BDFCF /* logo.jpg in Resources */ = {isa = PBXBuildFile; fileRef = B914608D103359E3005BDFCF /* logo.jpg */; };
B914609B103359E4005BDFCF /* 3DRotate.tiff in Resources */ = {isa = PBXBuildFile; fileRef = B914608E103359E3005BDFCF /* 3DRotate.tiff */; };
@@ -43,7 +38,6 @@
B933E9B1102B0B9000FD33FF /* MeVisOsiriXProxyProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = B933E9B0102B0B9000FD33FF /* MeVisOsiriXProxyProtocol.h */; };
B946FD32101760FB004AEED1 /* MeVisHubGUI.xib in Resources */ = {isa = PBXBuildFile; fileRef = B946FD31101760FB004AEED1 /* MeVisHubGUI.xib */; };
B94B3A221010C927004CBAEC /* MeVisLabHubPref.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = B94B3A211010C927004CBAEC /* MeVisLabHubPref.xcdatamodel */; };
- B9912200102DB75A007BB4B6 /* DCMView.h in Headers */ = {isa = PBXBuildFile; fileRef = B99121FF102DB75A007BB4B6 /* DCMView.h */; };
B9B5371E102B818700559FEB /* OsiriX2MeVisLabTBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = B9B5371D102B818700559FEB /* OsiriX2MeVisLabTBridge.mm */; };
B9B53728102B818F00559FEB /* OsiriX2MeVisLabTBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = B9B53727102B818F00559FEB /* OsiriX2MeVisLabTBridge.h */; };
B9FB832D101DA02200C7C47C /* ConfigCoreDataDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = B9FB832B101DA02200C7C47C /* ConfigCoreDataDelegate.h */; };
@@ -75,15 +69,10 @@
AB5D36050680E57E00F4007A /* MeVisLabHub.osirixplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeVisLabHub.osirixplugin; sourceTree = BUILT_PRODUCTS_DIR; };
ABA48A640680BB600089EB4F /* MeVisLabHub.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MeVisLabHub.h; sourceTree = "<group>"; };
ABA48A660680BB690089EB4F /* MeVisLabHub.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MeVisLabHub.m; sourceTree = "<group>"; };
- ABB76339067FB2A8000912C1 /* DCMPix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DCMPix.h; sourceTree = "<group>"; };
- ABB7633B067FB2A8000912C1 /* dicomFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dicomFile.h; sourceTree = "<group>"; };
- ABB7633C067FB2A8000912C1 /* MyPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyPoint.h; sourceTree = "<group>"; };
- ABB7633D067FB2A8000912C1 /* PluginFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginFilter.h; sourceTree = "<group>"; };
- ABB7633E067FB2A8000912C1 /* ROI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ROI.h; sourceTree = "<group>"; };
- ABB7633F067FB2A8000912C1 /* ViewerController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ViewerController.h; sourceTree = "<group>"; };
B7350C071042F3F900705C92 /* MeVisLabScriptingBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeVisLabScriptingBridge.h; sourceTree = "<group>"; };
B7350C081042F3F900705C92 /* MeVisLabScriptingBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MeVisLabScriptingBridge.m; sourceTree = "<group>"; };
B7350C141042F77700705C92 /* MeVisLab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeVisLab.h; sourceTree = "<group>"; };
+ B790D13B169616D500E0CD74 /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OsiriXAPI.framework; sourceTree = "<group>"; };
B914608C103359E3005BDFCF /* Length.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Length.tiff; sourceTree = "<group>"; };
B914608D103359E3005BDFCF /* logo.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = logo.jpg; sourceTree = "<group>"; };
B914608E103359E3005BDFCF /* 3DRotate.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = 3DRotate.tiff; sourceTree = "<group>"; };
@@ -105,7 +94,6 @@
B933E9B0102B0B9000FD33FF /* MeVisOsiriXProxyProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeVisOsiriXProxyProtocol.h; sourceTree = "<group>"; };
B946FD31101760FB004AEED1 /* MeVisHubGUI.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MeVisHubGUI.xib; sourceTree = "<group>"; };
B94B3A211010C927004CBAEC /* MeVisLabHubPref.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = MeVisLabHubPref.xcdatamodel; sourceTree = "<group>"; };
- B99121FF102DB75A007BB4B6 /* DCMView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCMView.h; sourceTree = "<group>"; };
B9B5371D102B818700559FEB /* OsiriX2MeVisLabTBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OsiriX2MeVisLabTBridge.mm; sourceTree = "<group>"; };
B9B53727102B818F00559FEB /* OsiriX2MeVisLabTBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OsiriX2MeVisLabTBridge.h; sourceTree = "<group>"; };
B9FB832B101DA02200C7C47C /* ConfigCoreDataDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfigCoreDataDelegate.h; sourceTree = "<group>"; };
@@ -120,6 +108,7 @@
buildActionMask = 2147483647;
files = (
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
+ B790D13C169616D500E0CD74 /* OsiriXAPI.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -162,7 +151,6 @@
08FB77AFFE84173DC02AAC07 /* Classes */ = {
isa = PBXGroup;
children = (
- ABB76338067FB2A8000912C1 /* OsiriX Headers */,
AB2C26750677B0C400A08910 /* MeVisLabHub */,
);
name = Classes;
@@ -171,6 +159,7 @@
1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
+ B790D13B169616D500E0CD74 /* OsiriXAPI.framework */,
1058C7ADFEA557BF11CA2CBB /* Cocoa.fra...
[truncated message content] |
|
From: <coe...@us...> - 2012-10-17 09:42:55
|
Revision: 428
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=428&view=rev
Author: coertmetz
Date: 2012-10-17 09:42:45 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
CM: Script update for 2.3.
Modified Paths:
--------------
trunk/Community/General/Modules/Macros/Fields/FieldTrigger.script
Modified: trunk/Community/General/Modules/Macros/Fields/FieldTrigger.script
===================================================================
--- trunk/Community/General/Modules/Macros/Fields/FieldTrigger.script 2012-10-16 08:37:32 UTC (rev 427)
+++ trunk/Community/General/Modules/Macros/Fields/FieldTrigger.script 2012-10-17 09:42:45 UTC (rev 428)
@@ -95,7 +95,6 @@
ListView {
name = fieldListBox
values = "Select fields"
- resizeMode = last
sortByColumn = 0
visibleRows = 10
layout = "tl,l"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-10-16 08:37:43
|
Revision: 427
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=427&view=rev
Author: coertmetz
Date: 2012-10-16 08:37:32 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
CM: Fixed a bug causing a crash with empty CSO lists.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp 2012-09-27 09:33:59 UTC (rev 426)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp 2012-10-16 08:37:32 UTC (rev 427)
@@ -195,7 +195,7 @@
for (unsigned int k=0; k<numOfPathPoints; k++)
{
vec3 posPathPoint = pathList->getPosAt(k);
- if (points.back()!=posPathPoint) points.push_back(posPathPoint);
+ if (points.size() == 0 || points.back()!=posPathPoint) points.push_back(posPathPoint);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-09-27 09:34:05
|
Revision: 426
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=426&view=rev
Author: coertmetz
Date: 2012-09-27 09:33:59 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
CM: Changed cout output to status field output.
Modified Paths:
--------------
trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h
Modified: trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def
===================================================================
--- trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def 2012-09-27 07:46:30 UTC (rev 425)
+++ trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def 2012-09-27 09:33:59 UTC (rev 426)
@@ -87,6 +87,10 @@
Button update {}
Field autoUpdate {}
}
+ Separator {}
+ Field status {
+ edit = False
+ }
}
}
} // MLModule XMarkerListFromFile
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp 2012-09-27 07:46:30 UTC (rev 425)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp 2012-09-27 09:33:59 UTC (rev 426)
@@ -104,6 +104,9 @@
_updateFld = fields->addNotify("update");
_autoUpdateFld = fields->addBool("autoUpdate");
+ // Status field
+ _statusFld = fields->addString("status", "");
+
// Reactivate calls of handleNotification on field changes.
handleNotificationOn();
}
@@ -121,15 +124,15 @@
// Check for the display of keepVecInputAsIs
if (_inputCoordinateSystemFld->getEnumValue()) {
- _isVoxelFld->setBoolValue(true);
+ _isVoxelFld->setBoolValue(true);
}
else {
- _isVoxelFld->setBoolValue(false);
+ _isVoxelFld->setBoolValue(false);
}
// Check if an input image is connected when coordinate system is set to voxel
if (_inputCoordinateSystemFld->getEnumValue()==1 && !getUpdatedInImg(0)) {
- std::cout << "When you select voxel as input coordinate system you should provide an input image!" << std::endl;
+ _statusFld->setStringValue("When you select voxel as input coordinate system you should provide an input image!");
return;
}
@@ -189,8 +192,11 @@
// Add marker to output list
_outputXMarkerList.appendItem(marker);
}
+ _statusFld->setStringValue("File successfully loaded!");
} else {
- std::cout << "Cannot open file (" << filename << ")!" << std::endl;
+ std::stringstream outputString;
+ outputString << "Cannot open file (" << filename << ")!";
+ _statusFld->setStringValue(outputString.str());
}
}
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h 2012-09-27 07:46:30 UTC (rev 425)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h 2012-09-27 09:33:59 UTC (rev 426)
@@ -97,6 +97,9 @@
BaseField *_outputXMarkerListFld;
XMarkerList _outputXMarkerList;
+ // Field to display status messages
+ StringField* _statusFld;
+
//@}
//! Implements interface for the runtime type system of the ML.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bro...@us...> - 2012-09-27 07:46:37
|
Revision: 425
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=425&view=rev
Author: broersen
Date: 2012-09-27 07:46:30 +0000 (Thu, 27 Sep 2012)
Log Message:
-----------
ENH: Changed WEMPtr back to WEM* to keep compatibility with MeVisLab version 2.2.1
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h
Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h 2012-09-14 08:02:44 UTC (rev 424)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h 2012-09-27 07:46:30 UTC (rev 425)
@@ -187,7 +187,7 @@
//! The WEM output field.
BaseField *_outputWEMFld;
//! The output WEM.
- WEMPtr _outWEM;
+ WEM *_outWEM;
//! Type a Matlab script into this field.
StringField* _matlabScriptFld;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rha...@us...> - 2012-09-14 08:02:55
|
Revision: 424
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=424&view=rev
Author: rhameeteman
Date: 2012-09-14 08:02:44 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
KH.
* fixed a few cast warnings
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLCMCoordinate/WorldInfo/mlWorldInfo.cpp
trunk/Community/General/Sources/ML/MLCMCurveList/CurveToString/mlCurveToString.cpp
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.cpp
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.h
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCA.cpp
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCAMatrixRoutines.h
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp
Modified: trunk/Community/General/Sources/ML/MLCMCoordinate/WorldInfo/mlWorldInfo.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCMCoordinate/WorldInfo/mlWorldInfo.cpp 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCMCoordinate/WorldInfo/mlWorldInfo.cpp 2012-09-14 08:02:44 UTC (rev 424)
@@ -295,9 +295,9 @@
vec3 imageWorldCenter(0,0,0);
SubImgBoxf imageWorldBox = SubImgBoxf();
Rotation imageWorldRotation = Rotation();
- float voxelvol = 0;
- float totalvol = 0;
- float megavoxel = 0;
+ double voxelvol = 0;
+ double totalvol = 0;
+ double megavoxel = 0;
MLDataType dType = MLuint16Type;
std::string pImgInfo = "No Connection";
mat4 zeroMat=mat4::getMat(0.0); /// TB 16.8.2001
@@ -476,7 +476,7 @@
}
}
}
- float det = rotationMatrix.det();
+ double det = rotationMatrix.det();
// Set rotation field only if there is a valid rotation matrix defined
if ( MLAbs(det - 1) < 0.0001 ){
imageWorldRotation = Rotation(rotationMatrix);
Modified: trunk/Community/General/Sources/ML/MLCMCurveList/CurveToString/mlCurveToString.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCMCurveList/CurveToString/mlCurveToString.cpp 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCMCurveList/CurveToString/mlCurveToString.cpp 2012-09-14 08:02:44 UTC (rev 424)
@@ -103,14 +103,15 @@
{
std::stringstream curveString;
+ std::stringstream indexString;
std::string vSep = f_ValueSeparator->getStringValue();
std::string cSep = f_CurveSeparator->getStringValue();
- int nCurveSets = m_InCurveList->getNumCurves();
+ size_t nCurveSets = m_InCurveList->getNumCurves();
if ( nCurveSets == 0 ) {return;}
for (int iSet = 0; iSet < nCurveSets; ++iSet ) {
- int nCurves = m_InCurveList->getCurveData( iSet )->getNumSeries();
+ size_t nCurves = m_InCurveList->getCurveData( iSet )->getNumSeries();
if (nCurves == 0 ) {continue;}
for (int iCurve = 0; iCurve < nCurves; ++iCurve ) {
@@ -118,9 +119,12 @@
CurveData *curveSet = m_InCurveList->getCurveData( iSet );
for (int iX = 0; iX < curveSet->getPoints(); ++iX ){
- float xValue = curveSet->getXValue( iX );
- float yValue = curveSet->getYValue( iCurve,iX );
+ const double yValue = curveSet->getYValue( iCurve,iX );
curveString << yValue << vSep;
+ if ( iCurve == 0 ){
+ const double xValue = curveSet->getXValue( iX );
+ indexString << xValue << vSep;
+ }
}
char dummy;
curveString >> dummy;
@@ -128,7 +132,9 @@
}
}
f_CurveString->setStringValue( curveString.str() );
-
+ char dummy;
+ indexString >> dummy;
+ f_IndexString->setStringValue( indexString.str() );
}
ML_END_NAMESPACE
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.cpp 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.cpp 2012-09-14 08:02:44 UTC (rev 424)
@@ -41,9 +41,9 @@
(_minimumDistancePoint2Fld = fieldC->addVec3f("minimumDistancePoint2"))->setVec3fValue(vec3(0.0,0.0,0.0));
_distancesFld = addString("distances",_tableHeader );
- _AverageMinimumDistanceFld = addFloat("averageMinimumDistance", 0.0f );
- _AverageMeanDistanceFld = addFloat("averageMeanDistance", 0.0f );
- _AverageMaxDistanceFld = addFloat("averageMaximumDistance", 0.0f );
+ _AverageMinimumDistanceFld = addDouble("averageMinimumDistance", 0.0 );
+ _AverageMeanDistanceFld = addDouble("averageMeanDistance", 0.0 );
+ _AverageMaxDistanceFld = addDouble("averageMaximumDistance", 0.0 );
//////////////////////////////////////////////////////////////////////////
@@ -252,9 +252,9 @@
double minDist = ML_DOUBLE_MAX;
vec3 point1;
vec3 point2;
- float averageMinDistance = 0.0f;
- float averageMeanDistance = 0.0f;
- float averageMaxDistance = 0.0f;
+ double averageMinDistance = 0.0;
+ double averageMeanDistance = 0.0;
+ double averageMaxDistance = 0.0;
for ( int iCSO = 0; iCSO<nCSOs; ++iCSO ){
CSO* currentCSO = _csoList0->getCSOAt( iCSO );
CSO* matchingCSO = _findMatchingCSO(iCSO);
@@ -322,9 +322,9 @@
_minimumDistancePoint2Fld->setVec3fValue(point2);
_minimumDistanceFld->setFloatValue( static_cast<float>(minDistance) );
- _AverageMinimumDistanceFld->setFloatValue( averageMinDistance );
- _AverageMeanDistanceFld->setFloatValue( averageMeanDistance );
- _AverageMaxDistanceFld->setFloatValue( averageMaxDistance );
+ _AverageMinimumDistanceFld->setDoubleValue( averageMinDistance );
+ _AverageMeanDistanceFld->setDoubleValue( averageMeanDistance );
+ _AverageMaxDistanceFld->setDoubleValue( averageMaxDistance );
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.h
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.h 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSODistance/CSODistance.h 2012-09-14 08:02:44 UTC (rev 424)
@@ -69,9 +69,9 @@
//! Field for holding the distances per cso
StringField* _distancesFld;
- FloatField* _AverageMinimumDistanceFld;
- FloatField* _AverageMeanDistanceFld;
- FloatField* _AverageMaxDistanceFld;
+ DoubleField* _AverageMinimumDistanceFld;
+ DoubleField* _AverageMeanDistanceFld;
+ DoubleField* _AverageMaxDistanceFld;
//! Apply field
NotifyField* _applyFld;
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCA.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCA.cpp 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCA.cpp 2012-09-14 08:02:44 UTC (rev 424)
@@ -72,7 +72,7 @@
- aMatrix[1][1] * aMatrix[2][3] * aMatrix[3][2]
- aMatrix[1][2] * aMatrix[2][1] * aMatrix[3][3];
- if (det != 0){ det = 1.0/det; }
+ if (det != 0){ det = 1.0f/det; }
// Compute adjacent matrix, transpose it and multiply with D
@@ -229,7 +229,7 @@
float** invMatrix = matrix(1,3,1,3);
float* eigenValues = vL_vector(1,3);
- const unsigned int size = pointCloud.size();
+ const int size = static_cast<int>( pointCloud.size() );
// copy positions to vertices
float* vertices = NULL;
@@ -252,7 +252,7 @@
_baryCenter = calcBaryCenter(vertices, size);
// Compute covariant matrix, so the Jacobian matrix can be computed
- getCovarianceMatrix(vertices, size, covaMatrix, _baryCenter);
+ getCovarianceMatrix(vertices, static_cast<long int>(size), covaMatrix, _baryCenter);
// Compute the Jacobian matrix
int nrot=0; // dummy variable
@@ -282,7 +282,7 @@
// Get extends of the bounding box
float minX=0, maxX=0, minY=0, maxY=0, minZ=0, maxZ=0;
- getBoundingBox(newVertices, size, minX, maxX, minY, maxY, minZ, maxZ);
+ getBoundingBox(newVertices, static_cast<long int>(size), minX, maxX, minY, maxY, minZ, maxZ);
// Extends of the object aligned bounding box
_xDiameter = maxX - minX;
@@ -290,9 +290,9 @@
_zDiameter = maxZ - minZ;
// Half the extend...
- float half_x = _xDiameter / 2.0;
- float half_y = _yDiameter / 2.0;
- float half_z = _zDiameter / 2.0;
+ float half_x = _xDiameter / 2.0f;
+ float half_y = _yDiameter / 2.0f;
+ float half_z = _zDiameter / 2.0f;
// Rotate all points back by multiplying them with the inverse Jacobian matrix.
getInverseMatrix(jacobiMat, invMatrix);
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCAMatrixRoutines.h
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCAMatrixRoutines.h 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOImageStatistics/MainAxisPCAMatrixRoutines.h 2012-09-14 08:02:44 UTC (rev 424)
@@ -147,16 +147,16 @@
}
if (i < 4) {
- tresh=0.2*sm/(n*n);
+ tresh=0.2f*sm/(n*n);
} else {
- tresh=0.0;
+ tresh=0.0f;
}
for (ip=1;ip<=n-1;ip++) {
for (iq=ip+1;iq<=n;iq++) {
- g=100.0*fabs(a[ip][iq]);
+ g=100.0f*fabs(a[ip][iq]);
if ((i > 4) && ((float)(fabs(d[ip])+g) == (float)fabs(d[ip]))
&& ((float)(fabs(d[iq])+g) == (float)fabs(d[iq]))){
@@ -169,14 +169,14 @@
if ((float)(fabs(h)+g) == (float)fabs(h)){
t=(a[ip][iq])/h;
} else {
- theta=0.5*h/(a[ip][iq]);
- t=1.0/(fabs(theta)+sqrt(1.0+theta*theta));
+ theta=0.5f*h/(a[ip][iq]);
+ t=1.0f/(fabs(theta)+static_cast<float>(sqrt(1.0f+theta*theta)));
if (theta < 0.0) { t = -t; }
}
- c=1.0/sqrt(1+t*t);
+ c=1.0f/sqrt(1+t*t);
s=t*c;
- tau=s/(1.0+c);
+ tau=s/(1.0f+c);
h=t*a[ip][iq];
z[ip] -= h;
z[iq] += h;
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp 2012-09-14 08:02:44 UTC (rev 424)
@@ -149,7 +149,7 @@
if (_inputCSOList!=NULL) {
// Get list index value
- int listIndex = mlMax (static_cast<MLint>(-1), _listIndexFld->getIntValue());
+ MLint listIndex = mlMax (static_cast<MLint>(-1), _listIndexFld->getIntValue());
// Get output options
const bool outputNormals = _outputCSONormals->getBoolValue();
@@ -173,7 +173,7 @@
currentIndex = 0;
} else {
numOfLoops = 1;
- currentIndex = listIndex;
+ currentIndex = static_cast<int>(listIndex);
}
for (int j=currentIndex; j<currentIndex + numOfLoops; j++) {
// Get CSO at listIndex
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp 2012-09-07 12:10:18 UTC (rev 423)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp 2012-09-14 08:02:44 UTC (rev 424)
@@ -501,8 +501,8 @@
// Common
if ( f_SetCSOLabel->getBoolValue() ) { currentCSO->setLabel( f_CSOLabel->getStringValue() ); notificationFlag |= CSOList::NOTIFICATION_CSO_FINISHED; }
if ( f_SetCSODescription->getBoolValue() ) { currentCSO->setDescription( f_CSODescription->getStringValue() ); notificationFlag |= CSOList::NOTIFICATION_CSO_FINISHED; }
- if ( f_SetCSOCreatorId->getBoolValue() ) { currentCSO->setCreatorId( f_CSOCreatorId->getIntValue() ); notificationFlag |= CSOList::NOTIFICATION_CSO_FINISHED; }
- if ( f_SetCSOTimePointIndex->getBoolValue() ) { currentCSO->setTimePointIndex( f_CSOTimePointIndex->getIntValue() ); notificationFlag |= CSOList::NOTIFICATION_CSO_FINISHED; }
+ if ( f_SetCSOCreatorId->getBoolValue() ) { currentCSO->setCreatorId( static_cast<int>(f_CSOCreatorId->getIntValue()) ); notificationFlag |= CSOList::NOTIFICATION_CSO_FINISHED; }
+ if ( f_SetCSOTimePointIndex->getBoolValue() ) { currentCSO->setTimePointIndex( static_cast<int>(f_CSOTimePointIndex->getIntValue()) ); notificationFlag |= CSOList::NOTIFICATION_CSO_FINISHED; }
if ( f_SetCSOIsSelected->getBoolValue() ) {
CSOList *currentList = currentCSO->getCSOList();
@@ -576,7 +576,7 @@
}
if ( f_SetGroupUseTimePointIndex->getBoolValue() ){ currentGroup->setUseTimePointIndex( f_GroupUseTimePointIndex->getBoolValue() ); notificationFlag |= CSOList::NOTIFICATION_REPAINT; }
- if ( f_SetGroupTimePointIndex->getBoolValue() ){ currentGroup->setTimePointIndex( f_GroupTimePointIndex->getIntValue() ); notificationFlag |= CSOList::NOTIFICATION_REPAINT; }
+ if ( f_SetGroupTimePointIndex->getBoolValue() ){ currentGroup->setTimePointIndex( static_cast<int>(f_GroupTimePointIndex->getIntValue()) ); notificationFlag |= CSOList::NOTIFICATION_REPAINT; }
if ( f_SetGroupUseShowState->getBoolValue() ) { currentGroup->setUseShowState( f_GroupUseShowState->getBoolValue() ); notificationFlag |= CSOList::NOTIFICATION_REPAINT; }
if ( f_SetGroupShowState->getBoolValue() ) { currentGroup->setShowState( f_GroupShowState->getBoolValue() ); notificationFlag |= CSOList::NOTIFICATION_REPAINT; }
@@ -606,7 +606,7 @@
// Rules
if ( f_SetGroupMaximumNumCSOs->getBoolValue() ) {
- currentGroup->getRules().setNumMaximumCSOs( f_GroupMaximumNumCSOs->getIntValue() );
+ currentGroup->getRules().setNumMaximumCSOs( static_cast<int>(f_GroupMaximumNumCSOs->getIntValue()) );
currentGroup->getRules().applyTo(*currentGroup);
notificationFlag |= (CSOList::NOTIFICATION_CSO_FINISHED | CSOList::NOTIFICATION_GROUP_FINISHED);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hj...@us...> - 2012-09-07 12:10:29
|
Revision: 423
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=423&view=rev
Author: hjkuijf
Date: 2012-09-07 12:10:18 +0000 (Fri, 07 Sep 2012)
Log Message:
-----------
Added allowed types.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListToFile.cpp
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp 2012-09-06 07:27:17 UTC (rev 422)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp 2012-09-07 12:10:18 UTC (rev 423)
@@ -63,9 +63,9 @@
// Add fields to the module and set their values.
_inputXMarkerListFld = fields.addBase("inputXMarkerList");
- _inputXMarkerListFld->setBaseValue(NULL);
+ _inputXMarkerListFld->addAllowedType<XMarkerList>();
_outputXMarkerListFld = fields.addBase("outputXMarkerList");
- _outputXMarkerListFld->setBaseValue(&_outputXMarkerList);
+ _outputXMarkerListFld->setBaseValueAndAddAllowedType(&_outputXMarkerList);
// Mode field: equidistant or add intermediate points
std::vector< std::string > modes( 4 );
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp 2012-09-06 07:27:17 UTC (rev 422)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp 2012-09-07 12:10:18 UTC (rev 423)
@@ -63,8 +63,10 @@
// Input and output XMarkerList
_inputXMarkerList = fields->addBase("inputXMarkerList");
+ _inputXMarkerList->addAllowedType<XMarkerList>();
+
_outputXMarkerList = fields->addBase("outputXMarkerList");
- _outputXMarkerList->setBaseValue(&_outXMarkerList);
+ _outputXMarkerList->setBaseValueAndAddAllowedType(&_outXMarkerList);
// Bool field to enable/disable transformation
_transformEnabled = fields->addBool("transformEnabled");
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp 2012-09-06 07:27:17 UTC (rev 422)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp 2012-09-07 12:10:18 UTC (rev 423)
@@ -98,7 +98,7 @@
// Output XMarkerList
_outputXMarkerListFld = fields->addBase("outputXMarkerList");
- _outputXMarkerListFld->setBaseValue(&_outputXMarkerList);
+ _outputXMarkerListFld->setBaseValueAndAddAllowedType(&_outputXMarkerList);
// Update fields
_updateFld = fields->addNotify("update");
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListToFile.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListToFile.cpp 2012-09-06 07:27:17 UTC (rev 422)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListToFile.cpp 2012-09-07 12:10:18 UTC (rev 423)
@@ -80,7 +80,7 @@
// Add input XMarkerList field containing the markers to write to file
_inputXMarkerListFld = fields->addBase("inputXMarkerList");
- _inputXMarkerListFld->setBaseValue(NULL);
+ _inputXMarkerListFld->addAllowedType<XMarkerList>();
// Add bools to select elements for the export
_positionXFld = fields->addBool("exportPositionX");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <awa...@us...> - 2012-09-06 07:27:24
|
Revision: 422
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=422&view=rev
Author: awakeideas
Date: 2012-09-06 07:27:17 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
OSX build fix
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro
trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp
Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro 2012-09-05 08:12:45 UTC (rev 421)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/MLMatlabScriptWrapper.pro 2012-09-06 07:27:17 UTC (rev 422)
@@ -14,7 +14,7 @@
DLLDESTDIR = ../../../lib
# add dependencies of this project here
-CONFIG += dll ML MLBase MLMacOSSupport MLWEM
+CONFIG += dll ML MLBase MLWEM MLOSXSupport
# set high warn level (warn 4 on MSCV)
WARN = HIGH
Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2012-09-05 08:12:45 UTC (rev 421)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2012-09-06 07:27:17 UTC (rev 422)
@@ -38,7 +38,9 @@
#include "mlMatlabScriptWrapper.h"
// SDK includes
-//#include <macBundle.h>
+#if defined(MACOS)
+# include <macBundle.h>
+#endif
// System includes
#include <iostream>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-09-05 08:12:55
|
Revision: 421
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=421&view=rev
Author: coertmetz
Date: 2012-09-05 08:12:45 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
CM: Changed WEM* to WEMPtr and commented include of macBundle.h, which is not existing in my Matlab folder.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp
trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h
Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2012-09-05 08:07:27 UTC (rev 420)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2012-09-05 08:12:45 UTC (rev 421)
@@ -38,7 +38,7 @@
#include "mlMatlabScriptWrapper.h"
// SDK includes
-#include <macBundle.h>
+//#include <macBundle.h>
// System includes
#include <iostream>
@@ -260,7 +260,7 @@
engClose(m_pEngine);
}
- ML_DELETE(_outWEM);
+ _outWEM = NULL;
}
Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h
===================================================================
--- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h 2012-09-05 08:07:27 UTC (rev 420)
+++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.h 2012-09-05 08:12:45 UTC (rev 421)
@@ -187,7 +187,7 @@
//! The WEM output field.
BaseField *_outputWEMFld;
//! The output WEM.
- WEM *_outWEM;
+ WEMPtr _outWEM;
//! Type a Matlab script into this field.
StringField* _matlabScriptFld;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-09-05 08:07:33
|
Revision: 420
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=420&view=rev
Author: coertmetz
Date: 2012-09-05 08:07:27 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
CM: MeVisLab 2.3 fix for MLBarcode. Changed long double to MLdouble.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLBarcode/mlBarcode.cpp
Modified: trunk/Community/General/Sources/ML/MLBarcode/mlBarcode.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLBarcode/mlBarcode.cpp 2012-08-31 12:09:21 UTC (rev 419)
+++ trunk/Community/General/Sources/ML/MLBarcode/mlBarcode.cpp 2012-09-05 08:07:27 UTC (rev 420)
@@ -473,8 +473,8 @@
getOutImg()->setPageExt ( Vector(_xsize, _ysizeFld->getIntValue(), 1, 1, 1, 1));
// Determine new min/max range.
- long double min = _backgroundFld->getIntValue();
- long double max = _foregroundFld->getIntValue();
+ MLdouble min = _backgroundFld->getIntValue();
+ MLdouble max = _foregroundFld->getIntValue();
getOutImg()->setMinVoxelValue( min );
getOutImg()->setMaxVoxelValue( max );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:09:32
|
Revision: 419
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=419&view=rev
Author: coertmetz
Date: 2012-08-31 12:09:21 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Added homogeneous 2D field.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.h
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp 2012-08-31 12:07:51 UTC (rev 418)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.cpp 2012-08-31 12:09:21 UTC (rev 419)
@@ -93,6 +93,9 @@
_homogeneousFld = fields->addBool("divideByHomogeneousCoordinate");
_homogeneousFld->setBoolValue(false);
+ _homogeneous2DFld = fields->addBool("divideByZCoordinate");
+ _homogeneous2DFld->setBoolValue(false);
+
// Reactivate calls of handleNotification on field changes.
handleNotificationOn();
}
@@ -131,12 +134,13 @@
if (!_transformEnabled->getBoolValue())
matrix = mat4::getIdentity();
+ // Clear output list
+ _outXMarkerList.clearList();
+
// Transform XMarkers
Base *baseValue = _inputXMarkerList->getBaseValue();
if (baseValue && BASE_IS_A(baseValue,XMarkerList)) {
XMarkerList *inXMarkerList = (XMarkerList *) baseValue;
- // Clear output list
- _outXMarkerList.clearList();
for (int i=0; i<int(inXMarkerList->getSize()); ++i) {
// Get marker position and transform it
XMarker marker = inXMarkerList->at (i);
@@ -152,13 +156,19 @@
marker.y() = vMarker[1];
marker.z() = vMarker[2];
}
+ if (_homogeneous2DFld->getBoolValue() && marker.z() != 0.0)
+ {
+ marker.pos[0] = marker.pos[0] / marker.pos[2];
+ marker.pos[1] = marker.pos[1] / marker.pos[2];
+ marker.pos[2] = 1.0;
+ }
// Add marker to output list
_outXMarkerList.appendItem (marker);
}
// Select XMarker which is selected in input list and notify attachments
_outXMarkerList.doSelectItem(inXMarkerList->getCurrentIndex());
- _outputXMarkerList->notifyAttachments();
}
+ _outputXMarkerList->notifyAttachments();
}
ML_END_NAMESPACE
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.h
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.h 2012-08-31 12:07:51 UTC (rev 418)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/TransformXMarkerList/mlTransformXMarkerList.h 2012-08-31 12:09:21 UTC (rev 419)
@@ -98,6 +98,7 @@
//! Field to enable homogeneous coordinates
BoolField *_homogeneousFld;
+ BoolField *_homogeneous2DFld;
//@}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:08:00
|
Revision: 418
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=418&view=rev
Author: coertmetz
Date: 2012-08-31 12:07:51 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Added new interpolation options.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.h
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp 2012-08-31 12:07:05 UTC (rev 417)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.cpp 2012-08-31 12:07:51 UTC (rev 418)
@@ -66,11 +66,32 @@
_inputXMarkerListFld->setBaseValue(NULL);
_outputXMarkerListFld = fields.addBase("outputXMarkerList");
_outputXMarkerListFld->setBaseValue(&_outputXMarkerList);
+
+ // Mode field: equidistant or add intermediate points
+ std::vector< std::string > modes( 4 );
+ modes[ 0 ] = "Equidistant";
+ modes[ 1 ] = "Intermediate points";
+ modes[ 2 ] = "Absolute marker indices";
+ modes[ 3 ] = "Equidistant marker indices";
+ _modeFld = fields.addEnum( "mode", modes );
+ _modeFld->setEnumValue( 0 );
// Sample distance for output XMarkerList
_sampleDistanceFld = fields.addFloat("sampleDistance");
_sampleDistanceFld->setFloatValue(0.5f);
+ // Number of intermediate points to add
+ _numIntermediatePointsFld = fields.addInt( "numberIntermediatePoints" );
+ _numIntermediatePointsFld->setIntValue( 3 );
+
+ // Marker indices for third mode
+ _absoluteMarkerIndicesFld = fields.addString( "absoluteMarkerIndices" );
+ _absoluteMarkerIndicesFld->setStringValue( "" );
+
+ // Number of total point for fourth mode
+ _numTotalPointsFld = fields.addInt( "numberTotalPoints" );
+ _numTotalPointsFld->setIntValue( 3 );
+
// Reactivate calls of handleNotification on field changes.
handleNotificationOn();
}
@@ -78,7 +99,7 @@
//----------------------------------------------------------------------------------
//! Handle field changes of the field field.
//----------------------------------------------------------------------------------
-void LinearInterpolateXMarkerList::handleNotification (Field * /*field*/ )
+void LinearInterpolateXMarkerList::handleNotification ( Field * field )
{
ML_TRACE_IN("LinearInterpolateXMarkerList::handleNotification ()");
@@ -86,60 +107,120 @@
_outputXMarkerList.clear();
Base * baseValue = _inputXMarkerListFld->getBaseValue();
- if (baseValue && BASE_IS_A(baseValue, XMarkerList)) {
+ if (baseValue && BASE_IS_A(baseValue, XMarkerList))
+ {
XMarkerList markers = *(XMarkerList*)baseValue;
- if (markers.size()>1 && markers.isModified()) {
- // Compute length XMarkerList
- double length = 0.0;
- for (size_t i=0; i<markers.size()-1; ++i) {
- length += (markers[i].pos-markers[i+1].pos).length();
- }
+ if ( markers.size() > 1 && ( markers.isModified() || field == _modeFld || field == _numIntermediatePointsFld || field == _sampleDistanceFld ) )
+ {
+ if ( _modeFld->getEnumValue() == 0 )
+ {
+ // Compute length XMarkerList
+ double length = 0.0;
+ for (size_t i=0; i<markers.size()-1; ++i) {
+ length += (markers[i].pos-markers[i+1].pos).length();
+ }
- // Check sample distance setting
- if (_sampleDistanceFld->getFloatValue()<=0.0f) {
- _sampleDistanceFld->setFloatValue(1.0f);
- }
- // Get sample distance setting
- const float sampleDistance = _sampleDistanceFld->getFloatValue();
+ // Check sample distance setting
+ if (_sampleDistanceFld->getFloatValue()<=0.0f) {
+ _sampleDistanceFld->setFloatValue(1.0f);
+ }
+ // Get sample distance setting
+ const float sampleDistance = _sampleDistanceFld->getFloatValue();
- // Add first point
- _outputXMarkerList.appendItem(markers[0]);
+ // Add first point
+ _outputXMarkerList.appendItem(markers[0]);
- // The stepsize is the sampledistance
- double stepSize = sampleDistance;
- // Centerline length already processed
- double curLength = 0.0;
- // Current line segment position
- unsigned int segmentPos = 0;
+ // The stepsize is the sampledistance
+ double stepSize = sampleDistance;
+ // Centerline length already processed
+ double curLength = 0.0;
+ // Current line segment position
+ unsigned int segmentPos = 0;
- // Get first position
- vec3 currentPos = markers[0].pos.getVec3();
- while (curLength < length && segmentPos<markers.size()-1) {
- // Determine direction
- vec3 direction = (vec6(markers[segmentPos+1].pos-markers[segmentPos].pos)).getVec3();
- direction.normalize();
- // Determine segment length
- double segmentLength=(markers[segmentPos+1].pos-markers[segmentPos].pos).length();
- double curSegmentLength=0.0;
- // Step in direction until next input point
- while (curSegmentLength+stepSize<segmentLength) {
+ // Get first position
+ vec3 currentPos = markers[0].pos.getVec3();
+ while (curLength < length && segmentPos<markers.size()-1) {
+ // Determine direction
+ vec3 direction = (vec6(markers[segmentPos+1].pos-markers[segmentPos].pos)).getVec3();
+ direction.normalize();
+ // Determine segment length
+ double segmentLength=(markers[segmentPos+1].pos-markers[segmentPos].pos).length();
+ double curSegmentLength=0.0;
+ // Step in direction until next input point
+ while (curSegmentLength+stepSize<segmentLength) {
+ currentPos = currentPos + stepSize * direction;
+ curSegmentLength += stepSize;
+ curLength += stepSize;
+ _outputXMarkerList.appendItem(XMarker (currentPos));
+ stepSize = sampleDistance;
+ }
+ // Determine rest length
+ stepSize = segmentLength-curSegmentLength;
+ // Update currentpos
currentPos = currentPos + stepSize * direction;
- curSegmentLength += stepSize;
- curLength += stepSize;
- _outputXMarkerList.appendItem(XMarker (currentPos));
- stepSize = sampleDistance;
+ curLength+=stepSize;
+ stepSize = sampleDistance - stepSize;
+
+ // Increment current line segment position
+ ++segmentPos;
}
- // Determine rest length
- stepSize = segmentLength-curSegmentLength;
- // Update currentpos
- currentPos = currentPos + stepSize * direction;
- curLength+=stepSize;
- stepSize = sampleDistance - stepSize;
-
- // Increment current line segment position
- ++segmentPos;
}
+ else if ( _modeFld->getEnumValue() == 1 )
+ {
+ for ( size_t i = 0; i < markers.size() - 1; ++i )
+ {
+ const float step = 1.0f / static_cast< float >( _numIntermediatePointsFld->getIntValue() + 1 );
+ _outputXMarkerList.appendItem( markers.at( i ) );
+ for ( float s = step; s <= 1.0f - step; s += step )
+ {
+ XMarker marker( ( 1.0f - s ) * markers.at( i ).pos + s * markers.at( i + 1 ).pos );
+ _outputXMarkerList.appendItem( marker );
+ }
+ _outputXMarkerList.appendItem( markers.at( i + 1 ) );
+ }
+ }
+ else if ( _modeFld->getEnumValue() == 2 )
+ {
+ // Retrieve locations
+ std::stringstream timePoints ( _absoluteMarkerIndicesFld->getStringValue() );
+ float timePoint;
+ std::vector< float > positions;
+ while ( timePoints >> timePoint )
+ {
+ positions.push_back( timePoint );
+ }
+ for ( size_t i = 0; i < positions.size(); ++i )
+ {
+ const size_t prevIndex = static_cast< size_t >( positions[ i ] );
+ const size_t nextIndex = static_cast< size_t >( positions[ i ] + 1 );
+ const float fraction = positions[ i ] - static_cast< float >( prevIndex );
+ if ( prevIndex >= 0 && nextIndex >= 0 && prevIndex < markers.size() && nextIndex < markers.size() )
+ {
+ XMarker marker( ( 1.0f - fraction ) * markers.at( prevIndex ).pos + fraction * markers.at( nextIndex ).pos );
+ marker.pos[ 0 ] = i;
+ _outputXMarkerList.appendItem( marker );
+ }
+ else
+ {
+ std::cerr << "Position " << positions[ i ] << " outside marker range. Skipping point." << std::endl;
+ }
+ }
+ }
+ else if ( _modeFld->getEnumValue() == 3 )
+ {
+ const float stepSize = static_cast< float >( markers.size() ) / ( static_cast< float >( _numTotalPointsFld->getIntValue() - 1 ) );
+ int i = 0;
+ for ( float f = 0; f < static_cast< float >( markers.size() ) + stepSize / 10.0f; f += stepSize, ++i )
+ {
+ const size_t prevIndex = std::min( markers.size() - 1, std::max( size_t( 0 ), static_cast< size_t >( f ) ) );
+ const size_t nextIndex = std::min( markers.size() - 1, static_cast< size_t >( f + 1 ) );
+ const float fraction = f - static_cast< float >( prevIndex );
+ XMarker marker( ( 1.0f - fraction ) * markers.at( prevIndex ).pos + fraction * markers.at( nextIndex ).pos );
+ marker.pos[ 0 ] = i;
+ _outputXMarkerList.appendItem( marker );
+ }
+ }
}
}
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.h
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.h 2012-08-31 12:07:05 UTC (rev 417)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/InterpolateXMarkerList/mlLinearInterpolateXMarkerList.h 2012-08-31 12:07:51 UTC (rev 418)
@@ -73,12 +73,16 @@
// ----------------------------------------------------------
//! Input and output XMarkerList fields
- BaseField *_inputXMarkerListFld;
- BaseField *_outputXMarkerListFld;
+ BaseField * _inputXMarkerListFld;
+ BaseField * _outputXMarkerListFld;
XMarkerList _outputXMarkerList;
//! Sample distance output XMarkerList
- FloatField *_sampleDistanceFld;
+ EnumField * _modeFld;
+ FloatField * _sampleDistanceFld;
+ IntField * _numIntermediatePointsFld;
+ StringField * _absoluteMarkerIndicesFld;
+ IntField * _numTotalPointsFld;
//@}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:07:16
|
Revision: 417
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=417&view=rev
Author: coertmetz
Date: 2012-08-31 12:07:05 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Some small code improvements.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.cpp
trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.h
Modified: trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.cpp 2012-08-31 12:05:53 UTC (rev 416)
+++ trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.cpp 2012-08-31 12:07:05 UTC (rev 417)
@@ -60,7 +60,7 @@
FieldContainer *fields = getFieldContainer();
ML_CHECK(fields);
- // Suppress calls of handleNotification on field changes.
+ // Suppress calls of hanbdleNotification on field changes.
handleNotificationOff();
// WEM Patch start and end index field
@@ -77,6 +77,7 @@
_autoClearFld->setBoolValue(true);
_autoApplyFld->setBoolValue(true);
_autoUpdateFld->setBoolValue(true);
+ _copyInputWEMsFld->setBoolValue(true);
_notifyFld = fields->addNotify("notify");
@@ -92,7 +93,6 @@
ML_TRACE_IN("WEMCMSelectPatches::~WEMCMSelectPatches()")
}
-
//----------------------------------------------------------------------------------
//! Handle field changes of the field \c field.
//----------------------------------------------------------------------------------
@@ -121,7 +121,6 @@
WEMProcessor::activateAttachments();
}
-
//----------------------------------------------------------------------------------
//! The process method is called by the parent class.
//----------------------------------------------------------------------------------
@@ -137,6 +136,7 @@
// Now call the own processing routine.
if (_inWEM!=NULL) {
selectPatch();
+ //std::cout<<"Process"<<std::endl;
}
// stop time measurement and mouse cursor resetting.
@@ -177,11 +177,7 @@
{
// Output selected WEM patches
for (int i=patchStartIndex; i<=patchEndIndex; ++i) {
- int index = i;
- // Circular behaviour
- while (index<0) {
- index = index + numPatches;
- }
+ const int index = ( i + numPatches ) % numPatches;
// Get input patch
WEMTrianglePatch * inPatch = (WEMTrianglePatch*) _inWEM->getWEMPatchAt(index % numPatches);
@@ -198,11 +194,7 @@
{
// Output selected WEM patches
for (int i=patchStartIndex; i<=patchEndIndex; ++i) {
- int index = i;
- // Circular behaviour
- while (index<0) {
- index = index + numPatches;
- }
+ const int index = ( i + numPatches ) % numPatches;
// Get input patch
WEMPolygonPatch * inPatch = (WEMPolygonPatch*) _inWEM->getWEMPatchAt(index % numPatches);
@@ -219,11 +211,7 @@
{
// Output selected WEM patches
for (int i=patchStartIndex; i<=patchEndIndex; ++i) {
- int index = i;
- // Circular behaviour
- while (index<0) {
- index = index + numPatches;
- }
+ const int index = ( i + numPatches ) % numPatches;
// Get input patch
WEMQuadPatch * inPatch = (WEMQuadPatch*) _inWEM->getWEMPatchAt(index % numPatches);
Modified: trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.h
===================================================================
--- trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.h 2012-08-31 12:05:53 UTC (rev 416)
+++ trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMCMSelectPatches/WEMCMSelectPatches.h 2012-08-31 12:07:05 UTC (rev 417)
@@ -96,6 +96,8 @@
//! The main processing routine which selects the patches.
void selectPatch();
+
+ FieldSensor* _wemSensor;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:06:04
|
Revision: 416
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=416&view=rev
Author: coertmetz
Date: 2012-08-31 12:05:53 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Improved notification handling.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp 2012-08-31 12:04:49 UTC (rev 415)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOPointsToXMarkers/mlCSOPointsToXMarkers.cpp 2012-08-31 12:05:53 UTC (rev 416)
@@ -90,6 +90,7 @@
{
if (_inputCSOList != NULL) {
_inputCSOList->removeNotificationObserver(CSOListNotifyObserverCB, this);
+ _inputCSOList=NULL;
}
}
@@ -114,11 +115,13 @@
// Get CSO list if changed
if (field==_inputCSOListFld) {
- if (_inputCSOList!=NULL) {
+ CSOList::removeNotificationObserverFromAllCSOLists(CSOListNotifyObserverCB, this);
+
+ //if (_inputCSOList!=NULL) {
// Remove old notification observer
- _inputCSOList->removeNotificationObserver(CSOListNotifyObserverCB, this);
- _inputCSOList=NULL;
- }
+ // _inputCSOList->removeNotificationObserver(CSOListNotifyObserverCB, this);
+ _inputCSOList=NULL;
+ //}
// Get input CSO list
Base *baseValue = _inputCSOListFld->getBaseValue();
@@ -127,9 +130,13 @@
// Add new notification observer
_inputCSOList->addNotificationObserver(CSOListNotifyObserverCB, this);
}
+
+ convertCSOToXMarkerList();
+ }
+ else if (field==_convertPathPoints || field==_listIndexFld || field==_outputCSONormals)
+ {
+ convertCSOToXMarkerList();
}
-
- convertCSOToXMarkerList();
}
//----------------------------------------------------------------------------------
@@ -154,6 +161,9 @@
}
else
{
+ // Disable output notifications
+ _outputXMarkerListFld->setBaseValue(NULL);
+
// If listIndex = -1, all CSOs in the list are exported;
// determine start index and number of CSOs to export.
int numOfLoops;
@@ -281,8 +291,9 @@
}
// Notify attached modules
- _outputXMarkerListFld->notifyAttachments();
+ //_outputXMarkerListFld->notifyAttachments();
}
+ _outputXMarkerListFld->setBaseValue(&_outputXMarkerList);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:04:55
|
Revision: 415
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=415&view=rev
Author: coertmetz
Date: 2012-08-31 12:04:49 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Added new interpolation options to GUI.
Modified Paths:
--------------
trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def
Modified: trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def
===================================================================
--- trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def 2012-08-31 12:04:02 UTC (rev 414)
+++ trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def 2012-08-31 12:04:49 UTC (rev 415)
@@ -27,9 +27,19 @@
Window {
Vertical {
margin = 3
+ Field mode {}
Field sampleDistance {
- tooltip = ""
+ dependsOn = "* mode == "Equidistant" *"
}
+ Field numberIntermediatePoints {
+ dependsOn = "* mode == "Intermediate points" *"
+ }
+ Field absoluteMarkerIndices {
+ dependsOn = "* mode == "Absolute marker indices" *"
+ }
+ Field numberTotalPoints {
+ dependsOn = "* mode == "Equidistant marker indices" *"
+ }
}
}
} // MLModule LinearInterpolateXMarkerList
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:04:13
|
Revision: 414
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=414&view=rev
Author: coertmetz
Date: 2012-08-31 12:04:02 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Added inventor output to module.
Modified Paths:
--------------
trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.mlab
Modified: trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.mlab
===================================================================
--- trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.mlab 2012-08-31 12:03:27 UTC (rev 413)
+++ trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.mlab 2012-08-31 12:04:02 UTC (rev 414)
@@ -2,16 +2,24 @@
network {
watchlist = ""
}
+module SoGroup {
+ internal {
+ frame = "589 -103 104 64"
+ moduleGroupName = ""
+ }
+ fields {
+ instanceName = InventorInput
+ }
+}
module TypeArithmetic1 {
internal {
- frame = "-11 213 120 56"
+ frame = "-35 213 120 56"
moduleGroupName = Mesh
windows {
window _default {
geometry = "474 484 366 66"
sizeHint = "366 66"
wasOpen = no
- wasActive = no
}
}
}
@@ -34,7 +42,6 @@
geometry = "406 576 468 190"
sizeHint = "468 190"
wasOpen = no
- wasActive = no
}
}
}
@@ -54,7 +61,6 @@
inFloat = 1
outFloat = -1
}
- internalFields = ""
}
module Bypass {
internal {
@@ -71,6 +77,13 @@
internal {
frame = "461 473 72 64"
moduleGroupName = ""
+ windows {
+ window _default {
+ geometry = "912 619 116 20"
+ sizeHint = "111 20"
+ wasOpen = no
+ }
+ }
}
fields {
instanceName = Scalar
@@ -100,7 +113,6 @@
geometry = "528 153 660 669"
sizeHint = "660 669"
wasOpen = no
- wasActive = no
}
}
}
@@ -122,10 +134,10 @@
lutRangeMin = 0
lutRangeMax = 255
lutAlphaSync = TRUE
- lutGreyCenter = 115.10001
- lutGreyWidth = 135.40001
- lutAlphaCenter = 115.10001
- lutAlphaWidth = 135.40001
+ lutGreyCenter = 155.50002
+ lutGreyWidth = 68.849983
+ lutAlphaCenter = 155.50002
+ lutAlphaWidth = 68.849983
lutColorFactor = "1 1 1"
lutAlphaFactor = 1
lutAutoDefault = FALSE
@@ -216,17 +228,17 @@
annotCTBottomRight = "CT Mode
Scan: $(AcquisitionDate)
LUT C/W: $(input07) / $(input08)"
- annoInput03 = 115.1
- annoInput04 = 135.4
- annoInput05 = "00.85 00.53 "
- annoInput06 = 135.400009155273
- annoInput07 = 115.1
- annoInput08 = 135.4
+ annoInput03 = 155.5
+ annoInput04 = 68.85
+ annoInput05 = 155.500015258789
+ annoInput06 = 68.849983215332
+ annoInput07 = 155.5
+ annoInput08 = 68.85
annoInput09 = GV
annoMouseOn = TRUE
- annoReadPixFloorPos = "212 156 0"
- annoReadPixVoxelPos = "212.339263916016 156.385467529297 0.5"
- annoReadPixWorldPos = "45.6778450012207 33.6128044128418 77"
+ annoReadPixFloorPos = "125 39 0"
+ annoReadPixVoxelPos = "125.29468536377 39.0338172912598 0.5"
+ annoReadPixWorldPos = "93.2946853637695 7.03381729125977 0.5"
borderOn = TRUE
borderColor = "0.899999976158142 0.899999976158142 0.899999976158142"
borderWidth = 1
@@ -235,7 +247,6 @@
borderFocusWidth = 2
mouseGrabberMode = FALSE
}
- internalFields = ""
}
module FormatFloat {
internal {
@@ -246,17 +257,15 @@
geometry = "203 457 400 102"
sizeHint = "400 102"
wasOpen = no
- wasActive = no
}
}
}
fields {
instanceName = FormatFloat
format = %05.2f
- value = "0.84535456 0.53420562"
- output = "00.85 00.53 "
+ value = "-4.6304874420166 -6.39335346221924 0"
+ output = "-4.63-6.39 00.00 "
}
- internalFields = ""
}
module SoView2DPosition {
internal {
@@ -267,7 +276,6 @@
geometry = "687 169 470 665"
sizeHint = "470 665"
wasOpen = no
- wasActive = no
}
}
}
@@ -295,8 +303,8 @@
renderOnSlab = FALSE
clipToSlice = FALSE
cursorShape = UNDEFINED_CURSOR
- worldPosition = "40.018482208252 43.7289199829102 77"
- firstSliceWorldPosition = "40.018482208252 43.7289199829102 77"
+ worldPosition = "-6.23797416687012 -22.116455078125 0.5"
+ firstSliceWorldPosition = "-6.23797416687012 -22.116455078125 0.5"
drawingModel = DRAWINGMODEL_CROSSHAIRS
drawingModelSize = -1
crossHairSpacing = 0
@@ -325,7 +333,6 @@
geometry = "474 484 366 35"
sizeHint = "366 35"
wasOpen = no
- wasActive = no
}
}
}
@@ -350,14 +357,13 @@
}
module SoView2D {
internal {
- frame = "1 141 96 56"
+ frame = "-23 141 96 56"
moduleGroupName = Mesh
windows {
window _default {
- geometry = "183 338 447 513"
- sizeHint = "447 513"
+ geometry = "129 524 696 502"
+ sizeHint = "439 502"
wasOpen = no
- wasActive = no
}
}
}
@@ -367,16 +373,17 @@
sliceStep = 1
numSlices = 1
numXSlices = 1
- maxSlice = 0
+ maxSlice = 5
keepSlicesInView = FALSE
slab = 1
lowerLeft = "0 0"
upperRight = "1 1"
margin = "2 2"
spacing = "4 4"
- plane = "0 0 1 0"
+ plane = "0 0 1 0.5"
sliceZoom = 1
sliceZoomSynchronized = 1
+ zoomCenter = "0.5 0.5"
minSliceZoomKeyboard = 1
sliceOrigin = "0 0"
viewingCenter = "0 0 0"
@@ -430,7 +437,7 @@
}
module SoSeparator {
internal {
- frame = "-55 61 112 56"
+ frame = "-79 61 112 56"
moduleGroupName = Mesh
}
fields {
@@ -450,7 +457,6 @@
geometry = "543 459 104 25"
sizeHint = "64 25"
wasOpen = no
- wasActive = no
}
}
}
@@ -469,20 +475,19 @@
geometry = "513 502 296 290"
sizeHint = "296 290"
wasOpen = no
- wasActive = no
}
}
}
fields {
instanceName = GetVoxelValue
- position = "40.018482208252 43.7289199829102 77 0 0 0"
+ position = "-6.23797416687012 -22.116455078125 0.5 0 0 0"
updateMode = AutoClear
coordinateType = World
}
}
module SoGroup {
internal {
- frame = "473 -203 96 56"
+ frame = "469 -219 152 56"
moduleGroupName = ""
}
fields {
@@ -504,14 +509,13 @@
}
module SoSwitch {
internal {
- frame = "357 -103 120 64"
+ frame = "461 -103 120 64"
moduleGroupName = ""
windows {
window _default {
geometry = "642 474 173 90"
sizeHint = "173 90"
wasOpen = no
- wasActive = no
}
}
}
@@ -526,11 +530,15 @@
moduleGroupName = Vectors
windows {
window _default {
- geometry = "964 454 439 502"
+ geometry = "92 456 439 502"
sizeHint = "439 502"
wasOpen = no
- wasActive = no
}
+ window _automatic {
+ geometry = "717 329 500 600"
+ sizeHint = "260 223"
+ wasOpen = no
+ }
}
}
fields {
@@ -539,18 +547,19 @@
sliceStep = 1
numSlices = 1
numXSlices = 1
- maxSlice = 0
+ maxSlice = 5
keepSlicesInView = FALSE
slab = 1
lowerLeft = "0 0"
upperRight = "1 1"
margin = "2 2"
spacing = "4 4"
- plane = "0 0 1 77"
- sliceZoom = 2.6999996
- sliceZoomSynchronized = 2.6999996
+ plane = "0 0 1 0.5"
+ sliceZoom = 1
+ sliceZoomSynchronized = 1
+ zoomCenter = "0.5 0.5"
minSliceZoomKeyboard = 1
- sliceOrigin = "100.174102783203 89.9873275756836"
+ sliceOrigin = "0 0"
viewingCenter = "0 0 0"
enableViewingCenter = FALSE
unzoomOnImageChange = FALSE
@@ -609,33 +618,31 @@
geometry = "939 618 116 22"
sizeHint = "56 22"
wasOpen = no
- wasActive = no
}
}
}
fields {
instanceName = ViewVectors
- whichChild = -3
- on = TRUE
+ whichChild = -1
+ on = FALSE
}
}
module SoToggle {
internal {
- frame = "-99 145 88 64"
+ frame = "-123 145 88 64"
moduleGroupName = Mesh
windows {
window _default {
geometry = "543 459 104 25"
sizeHint = "63 25"
wasOpen = no
- wasActive = no
}
}
}
fields {
instanceName = ViewMesh
- whichChild = -1
- on = FALSE
+ whichChild = -3
+ on = TRUE
}
}
module SoMouseGrabber {
@@ -647,7 +654,6 @@
geometry = "140 234 477 515"
sizeHint = "477 515"
wasOpen = no
- wasActive = no
}
}
}
@@ -671,13 +677,12 @@
cursorShape = UNDEFINED_CURSOR
absX = 0
absY = 0
- y = 1
x = 1
y = 1
xmin = 0
- xmax = 255
- ymin = 0
- ymax = 255
+ xmax = 15.686558
+ ymin = -7.7616234
+ ymax = 7.9249339
cursorPresent = FALSE
checkCursorPresent = FALSE
maskValid = FALSE
@@ -703,21 +708,20 @@
geometry = "632 337 612 532"
sizeHint = "612 532"
wasOpen = no
- wasActive = no
}
}
}
fields {
instanceName = overlayLut
_channelEditorState = ""
- alphaCenter = 131
- alphaWidth = 143
- greyCenter = 131
- greyWidth = 143
- redCenter = 131
- redWidth = 143
- blueCenter = 131
- blueWidth = 143
+ alphaCenter = 1
+ alphaWidth = 1
+ greyCenter = 1
+ greyWidth = 1
+ redCenter = 7.9250002
+ redWidth = 15.690001
+ blueCenter = 7.9250002
+ blueWidth = 15.690001
useColorRamps = FALSE
invertGrey = FALSE
invertAlpha = FALSE
@@ -726,13 +730,13 @@
autoSetDefaultRamp = FALSE
setDefaultRampOnce = TRUE
inputImageValid = TRUE
- rangeMin = 0
- rangeMax = 255
+ rangeMin = -7.7616234
+ rangeMax = 7.9249339
widthMin = 0
enableNegWidth = FALSE
- widthMax = 255
- rangeStep = 1.0000001
- rangeStepStep = 10.000001
+ widthMax = 15.686558
+ rangeStep = 0.050000001
+ rangeStepStep = 0.5
selectorX = 0
selectorY = 0
setInputMinMax = TRUE
@@ -797,7 +801,6 @@
geometry = "402 360 473 349"
sizeHint = "473 349"
wasOpen = no
- wasActive = no
}
}
}
@@ -849,7 +852,6 @@
geometry = "521 318 232 584"
sizeHint = "232 584"
wasOpen = no
- wasActive = no
}
}
}
@@ -878,33 +880,32 @@
clipToSlice = FALSE
cursorShape = UNDEFINED_CURSOR
midpointSize = 0.059999999
- vectorWidth = 0.1
- vectorLength = 10
+ vectorWidth = 0.19000003
+ vectorLength = 2
vectorMinLength = 0
midpointSegments = 10
midpointAbsoluteSize = FALSE
- vectorAbsoluteSize = TRUE
+ vectorAbsoluteSize = FALSE
vectorColor = "0.666666686534882 0 0"
midpointColor = "1 1 0"
- stepWidth = 5
- drawArrowTips = FALSE
+ stepWidth = 3
+ drawArrowTips = TRUE
arrowTipColor = "0 1 0"
- arrowTipWidth = 1
- arrowTipHeight = 1
+ arrowTipWidth = 0.70000029
+ arrowTipHeight = 0.70000029
normalizeVectors = FALSE
useComps2And3 = FALSE
}
}
module SoView2DDeformationGridView {
internal {
- frame = "-167 277 208 56"
+ frame = "-191 277 208 56"
moduleGroupName = Mesh
windows {
window _default {
geometry = "204 416 222 297"
sizeHint = "222 297"
wasOpen = no
- wasActive = no
}
}
}
@@ -932,7 +933,7 @@
renderOnSlab = FALSE
clipToSlice = FALSE
cursorShape = UNDEFINED_CURSOR
- stepWidth = 5
+ stepWidth = 2
gridColor = "0 0.666666686534882 1"
gridPointColor = "1 1 1"
drawGridPoints = FALSE
@@ -947,28 +948,26 @@
moduleGroupName = ""
windows {
window _default {
- geometry = "725 219 200 200"
- sizeHint = "200 200"
+ geometry = "349 726 400 400"
+ sizeHint = "400 400"
wasOpen = no
- wasActive = no
}
window Settings {
- geometry = "56 258 278 378"
- sizeHint = "278 378"
- wasOpen = no
- wasActive = no
+ geometry = "1071 936 635 508"
+ sizeHint = "246 508"
+ wasOpen = yes
}
window _automatic {
geometry = "1286 266 500 600"
sizeHint = "260 223"
wasOpen = no
- wasActive = no
}
}
}
fields {
instanceName = View2D
inventorInputOn = TRUE
+ inventorOutputOn = FALSE
view2DExtensionsOn = FALSE
startSlice = 0
numSlices = 1
@@ -986,14 +985,14 @@
cineSpeed = 0.1
snapToCenter = FALSE
zoomMode = VIEW2D_AUTO_ZOOM
- unzoomOnImageChange = FALSE
- sliceZoom = 2.6999996
- sliceZoomSynced = 2.6999996
+ unzoomOnImageChange = TRUE
+ sliceZoom = 1
+ sliceZoomSynced = 1
baseColor = "1 1 1"
margin = "2 2"
- sliceOrigin = "96.5273818969727 86.3406066894531"
- lutCenter = 131
- lutWidth = 143
+ sliceOrigin = "0 0"
+ lutCenter = 127.5
+ lutWidth = 255
lutUseTraceColors = FALSE
annotationOn = TRUE
annotationMode = ANNO_MODE_AUTO
@@ -1006,9 +1005,9 @@
borderColor = "0.899999976158142 0.899999976158142 0.899999976158142"
valueHighPrecision = FALSE
maxPrecision = 4
- plane = "0 0 1 77"
+ enableSlicing = TRUE
+ plane = "0 0 1 0.5"
}
- internalFields = ""
}
connections {
TypeArithmetic1.input0 = Vector.output0
@@ -1020,19 +1019,22 @@
SoGroup2.children = "SoSeparator1.self SoSeparator.self"
SoView2D1.image = TypeArithmetic1.output0
SoView2D1.startSlice = View2D.startSlice
+ SoView2D1.sliceZoomSynchronized = View2D.sliceZoom
+ SoView2D1.sliceOrigin = View2D.sliceOrigin
SoView2D1.timePoint = View2D.timePoint
SoSeparator1.children = "ViewMesh.self SoView2D1.self"
ShowVectorValue.on = Negation.inToggle
ShowVectorValue.children = View2DExtensions.outNode
GetVoxelValue.input0 = Vector.output0
GetVoxelValue.position = SoView2DPosition.worldPosition
- SoGroup1.children = "ShowMagnitude.self ShowVectorValue.self"
+ SoGroup1.children = "ShowMagnitude.self ShowVectorValue.self InventorInput.self ShowVectorValue.self"
SoSeparator.children = "ViewVectors.self SoView2D.self"
ShowMagnitude.children = "SoGroup2.self SoSeparator2.self"
SoView2D.image = Vector.output0
SoView2D.startSlice = View2D.startSlice
SoView2D.sliceZoomSynchronized = View2D.sliceZoom
SoView2D.sliceOrigin = View2D.sliceOrigin
+ SoView2D.unzoom = View2D.unzoom
SoView2D.timePoint = View2D.timePoint
ViewVectors.children = SoView2DVectorFieldView.self
ViewMesh.children = SoView2DDeformationGridView.self
@@ -1048,8 +1050,8 @@
SoView2DOverlay.image = VectorLength.output0
SoView2DVectorFieldView.stepWidth = SoView2DDeformationGridView.stepWidth
View2D.inImage = Scalar.output0
- View2D.inInvPreLUT = SoGroup1.self
- View2D.inInvPostLUT = SoView2DPosition.self
+ View2D.inInvPostLUT = ShowVectorValue.self
+ View2D.inInvPostViewer = SoGroup1.self
View2D.view2DExtensionsOn = Negation.outToggle
}
networkModel {
@@ -1083,7 +1085,7 @@
uniqueId = 169
objectName = Mesh
parentUniqueId = 0
- frame = "-192 -14 326 372"
+ frame = "-216 -14 326 372"
color {
r = 85
g = 170
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:03:36
|
Revision: 413
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=413&view=rev
Author: coertmetz
Date: 2012-08-31 12:03:27 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Added inventor output to module.
Modified Paths:
--------------
trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.script
Modified: trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.script
===================================================================
--- trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.script 2012-08-31 12:02:51 UTC (rev 412)
+++ trunk/Community/General/Modules/Macros/Viewers/VectorFieldView.script 2012-08-31 12:03:27 UTC (rev 413)
@@ -41,6 +41,7 @@
Inputs {
Field input0 { internalName = Scalar.input0 comment = "Scalar image" }
Field input1 { internalName = Vector.input0 comment = "Vector image" }
+ Field inventorInput { internalName = InventorInput.child }
}
Outputs {
Field output0 { internalName = View2D.scene.self hidden = yes }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <coe...@us...> - 2012-08-31 12:03:01
|
Revision: 412
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=412&view=rev
Author: coertmetz
Date: 2012-08-31 12:02:51 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
CM: Replaced not working lstrip part.
Modified Paths:
--------------
trunk/Community/General/Modules/Macros/Fields/FieldWriter.py
Modified: trunk/Community/General/Modules/Macros/Fields/FieldWriter.py
===================================================================
--- trunk/Community/General/Modules/Macros/Fields/FieldWriter.py 2012-08-15 12:41:12 UTC (rev 411)
+++ trunk/Community/General/Modules/Macros/Fields/FieldWriter.py 2012-08-31 12:02:51 UTC (rev 412)
@@ -110,13 +110,13 @@
file.write( header )
fieldList = ctx.field('selectedFields').value.split(',')
file.write( GetValues() )
- if ( ctx.field('append').value == True ):
- file.write( '\n' )
+ #if ( ctx.field('append').value == True ):
+ # file.write( '\n' )
file.close()
return
def GetValues( arg=None):
- selectedFields = ctx.field('selectedFields').stringValue().lstrip('Module.Field,')
+ selectedFields = ctx.field('selectedFields').stringValue()[13:]
outputString = ''
if len(selectedFields) > 0:
fieldList = selectedFields.split(',')
@@ -136,7 +136,7 @@
return outputString
def GetOutput( arg = None ):
- selectedFields = ctx.field('selectedFields').stringValue().lstrip('Module.Field,')
+ selectedFields = ctx.field('selectedFields').stringValue()[13:]
outputString = ''
if ( ctx.field("writeHeader").boolValue() and not ctx.field("append").boolValue() ) :
outputString = selectedFields + '\n'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rha...@us...> - 2012-08-15 12:41:19
|
Revision: 411
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=411&view=rev
Author: rhameeteman
Date: 2012-08-15 12:41:12 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
HK.
* added field keep "input vector as is"
When a XMarkerList file is loaded and the input coordinate system is voxel, then only the position is converted to world, not the vector (in case something else is stored in the vec field)
Modified Paths:
--------------
trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp
trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h
Modified: trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def
===================================================================
--- trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def 2012-07-12 12:21:44 UTC (rev 410)
+++ trunk/Community/General/Modules/ML/MLXMarkerListCommunityModules/MLXMarkerListCommunityModules.def 2012-08-15 12:41:12 UTC (rev 411)
@@ -54,13 +54,20 @@
Vertical {
margin=3
Field filename { browseButton = true browseFilter = "Text files (*.txt);;All files (*.*)"}
- Field importPositionX {}
- Field importPositionY {}
- Field importPositionZ {}
- Field importPositionT {}
- Field importVectorX {}
- Field importVectorY {}
- Field importVectorZ {}
+ Horizontal {
+ Box Position {
+ Field importPositionX {}
+ Field importPositionY {}
+ Field importPositionZ {}
+ Field importPositionT {}
+ }
+ Box Vector {
+ Field importVectorX {}
+ Field importVectorY {}
+ Field importVectorZ {}
+ Field keepVecInputAsIs { dependsOn = isVoxel}
+ }
+ }
Field importType { alignGroup=left }
Field numElementsToSkip {}
Field inputCoordinateSystem {}
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp 2012-07-12 12:21:44 UTC (rev 410)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.cpp 2012-08-15 12:41:12 UTC (rev 411)
@@ -81,6 +81,11 @@
_vectorZFld->setBoolValue(false);
_typeFld = fields->addBool("importType");
_typeFld->setBoolValue(false);
+
+ _keepVectorInputAsIsFld = fields->addBool("keepVecInputAsIs");
+ _keepVectorInputAsIsFld->setBoolValue(false);
+ _isVoxelFld = fields->addBool("isVoxel");
+ _isVoxelFld->setBoolValue(false);
// Add input coordinate system field
const char *_inputCoordinateSystemFldValues[] = { "world", "voxel" };
@@ -114,6 +119,14 @@
if ( field==_updateFld || ( _autoUpdateFld->getBoolValue() && field != _outputXMarkerListFld ) ) {
_outputXMarkerList.clear();
+ // Check for the display of keepVecInputAsIs
+ if (_inputCoordinateSystemFld->getEnumValue()) {
+ _isVoxelFld->setBoolValue(true);
+ }
+ else {
+ _isVoxelFld->setBoolValue(false);
+ }
+
// Check if an input image is connected when coordinate system is set to voxel
if (_inputCoordinateSystemFld->getEnumValue()==1 && !getUpdatedInImg(0)) {
std::cout << "When you select voxel as input coordinate system you should provide an input image!" << std::endl;
@@ -147,6 +160,7 @@
if (_vectorZFld->getBoolValue()) if ( !(file_op >> tokens[6]) ) break;
if (_typeFld->getBoolValue()) if ( !(file_op >> tokens[7]) ) break;
vec3 voxel (atof (tokens[0].c_str()), atof(tokens[1].c_str()), atof(tokens[2].c_str()));
+
// When coordinates in file are in world coordinates, we are done
vec3 world = voxel;
vec3 vec;
@@ -154,13 +168,17 @@
vec[1] = atof (tokens[5].c_str());
vec[2] = atof (tokens[6].c_str());
int type = atoi (tokens[7].c_str());
+
// When coordinates in file are in voxel coordinates, we need to convert both the
// position and the vector to world coordinates
if (_inputCoordinateSystemFld->getEnumValue()) {
getUpdatedInImg(0)->transformToWorldCoord(voxel+vec3(0.5, 0.5, 0.5), world);
vec3 vecWOrld;
- getUpdatedInImg(0)->transformToWorldCoord(voxel+vec+vec3(0.5, 0.5, 0.5), vecWOrld);
- vec = vecWOrld - world;
+ if (!_keepVectorInputAsIsFld->getBoolValue())
+ {
+ getUpdatedInImg(0)->transformToWorldCoord(voxel+vec+vec3(0.5, 0.5, 0.5), vecWOrld);
+ vec = vecWOrld - world;
+ }
}
marker.pos[0] = world[0];
marker.pos[1] = world[1];
Modified: trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h
===================================================================
--- trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h 2012-07-12 12:21:44 UTC (rev 410)
+++ trunk/Community/General/Sources/ML/MLXMarkerListCommunityModules/XMarkerListFile/mlXMarkerListFromFile.h 2012-08-15 12:41:12 UTC (rev 411)
@@ -86,6 +86,9 @@
BoolField *_vectorYFld;
BoolField *_vectorZFld;
BoolField *_typeFld;
+
+ BoolField *_keepVectorInputAsIsFld;
+ BoolField *_isVoxelFld;
// Skip a certain number of line at the start of the file
IntField *_skipElementsFld;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hj...@us...> - 2012-07-12 12:21:52
|
Revision: 410
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=410&view=rev
Author: hjkuijf
Date: 2012-07-12 12:21:44 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
Updated the PlaneClip module:
- updated the code to MeVisLab 2.3 and the "new style ML module"
- accept planes in world coordinates (note: voxel coordinates no longer work!)
- added "intersection mode": determines what to do with voxels that intersect the plane
- added mhelp file
Modified Paths:
--------------
trunk/Community/General/Modules/ML/MLImageUtilities/MLImageUtilities.def
trunk/Community/General/Sources/ML/MLImageUtilities/MLImageUtilities.pro
trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.cpp
trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.h
Added Paths:
-----------
trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/
trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/Images/
trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/Images/Screenshots/
trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/Images/Screenshots/PlaneClip._default.png
trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/PlaneClip.mhelp
Modified: trunk/Community/General/Modules/ML/MLImageUtilities/MLImageUtilities.def
===================================================================
--- trunk/Community/General/Modules/ML/MLImageUtilities/MLImageUtilities.def 2012-05-09 06:47:09 UTC (rev 409)
+++ trunk/Community/General/Modules/ML/MLImageUtilities/MLImageUtilities.def 2012-07-12 12:21:44 UTC (rev 410)
@@ -1,79 +1,145 @@
-
-//----------------------------------------------------------------------------------
-// MLModule MIP
-//----------------------------------------------------------------------------------
-MLModule MIP {
- DLL = "MLImageUtilities"
- author = "Bart De Dobbelaer"
- status = "stable"
- comment = "Project image with Maximum Intensity Projection"
- keywords = "mip xray"
- seeAlso = "MIPMacro Reformat Resample3D OrthoSwapFlip"
- exampleNetwork = "$(LOCAL)/MIP/MIPExample.mlab"
-
- Window {
- Category {
- Field = direction
- Separator { direction = Horizontal }
- Horizontal {
- CheckBox = autoUpdate
- Button update { dependsOn = !autoUpdate }
- }
- }
- }
-} // MLModule MIP
-
-//----------------------------------------------------------------------------------
-// MLModule PlaneClip
-//----------------------------------------------------------------------------------
-MLModule PlaneClip {
- DLL = "MLImageUtilities"
- author = "Bart De Dobbelaer"
- status = "stable"
- exampleNetwork = "$(LOCAL)/PlaneClip/PlaneClipExample.mlab"
- Window {
- Category {
- Field plane { title = "" }
- Horizontal {
- alignX = right
- Field = autoApply
- Button apply { dependsOn = !autoApply }
- }
- }
- }
-
-} // MLModule PlaneClip
-
-//----------------------------------------------------------------------------------
-// MLModule AnalyzeHeader
-//----------------------------------------------------------------------------------
-MLModule AnalyzeHeader {
- DLL = "MLImageUtilities"
- author = "Bart De Dobbelaer"
- status = "stable"
- comment = "Parses Analyze Header for scale factor"
-
- Window {
- Category {
- w = 250 mw = 250 pw = 250
- Field filename { browseButton = YES browseMode = open }
- Separator { direction = Horizontal }
- Field funused1 { edit = NO minLength = 10 }
- Field funused2 { edit = NO minLength = 10 }
- Field funused3 { edit = NO minLength = 10 }
- Separator { direction = Horizontal }
- Field dimensions { edit = NO minLength = 10 }
- Field voxelSize { edit = NO minLength = 10 }
- Field origin { edit = NO minLength = 10 }
- }
- }
-} // MLModule AnalyzeHeader
-
-//---------------------------------------------------------------------
-// MacroModule LocalAnalyzeLoad
-//----------------------------------------------------------------------------------
-MacroModule LocalAnalyzeLoad {
- author = "Bart De Dobbelaer"
- status = "stable"
- externalDefinition = "$(LOCAL)/LocalAnalyzeLoad/LocalAnalyzeLoad.script"
-} // MacroModule LocalAnalyzeLoad
+
+//----------------------------------------------------------------------------------
+// MLModule MIP
+//----------------------------------------------------------------------------------
+MLModule MIP {
+ DLL = "MLImageUtilities"
+ author = "Bart De Dobbelaer"
+ status = "stable"
+ comment = "Project image with Maximum Intensity Projection"
+ keywords = "mip xray"
+ seeAlso = "MIPMacro Reformat Resample3D OrthoSwapFlip"
+ exampleNetwork = "$(LOCAL)/MIP/MIPExample.mlab"
+
+ Window {
+ Category {
+ Field = direction
+ Separator { direction = Horizontal }
+ Horizontal {
+ CheckBox = autoUpdate
+ Button update { dependsOn = !autoUpdate }
+ }
+ }
+ }
+} // MLModule MIP
+
+//----------------------------------------------------------------------------------
+// MLModule PlaneClip
+//----------------------------------------------------------------------------------
+MLModule PlaneClip {
+ DLL = "MLImageUtilities"
+ author = "Bart De Dobbelaer"
+ status = "stable"
+ exampleNetwork = "$(LOCAL)/PlaneClip/PlaneClipExample.mlab"
+
+ Description {
+ Field globalSubsample {
+ min = 1
+ max = 6
+ }
+ Field xSubsample {
+ min = 1
+ max = 6
+ }
+ Field ySubsample {
+ min = 1
+ max = 6
+ }
+ Field zSubsample {
+ min = 1
+ max = 6
+ }
+ Field volumeThreshold {
+ min = 0
+ max = 1
+ }
+ }
+
+ Window {
+ Category {
+ Field plane { title = "" }
+
+ Box "Intersection Mode" {
+ Field intersectionMode {}
+
+ Field volumeThreshold {
+ step = 0.1
+ dependsOn = "* intersectionMode == "IntersectionModeVolume" *"
+ }
+
+ Field useGlobalSubsample {
+ dependsOn = "* intersectionMode == "IntersectionModeVolume" || intersectionMode == "IntersectionModeAntiAliasing" *"
+ }
+
+ Field globalSubsample {
+ dependsOn = "* useGlobalSubsample && (intersectionMode == "IntersectionModeVolume" || intersectionMode == "IntersectionModeAntiAliasing") *"
+ visibleOn = useGlobalSubsample
+ title = "Subsample:"
+ step = 1
+ }
+
+ Horizontal {
+ Field xSubsample {
+ dependsOn = !useGlobalSubsample
+ visibleOn = !useGlobalSubsample
+ title = "X:"
+ step = 1
+ }
+ Field ySubsample {
+ dependsOn = !useGlobalSubsample
+ visibleOn = !useGlobalSubsample
+ title = "Y:"
+ step = 1
+ }
+ Field zSubsample {
+ dependsOn = !useGlobalSubsample
+ visibleOn = !useGlobalSubsample
+ title = "Z:"
+ step = 1
+ }
+ }
+ }
+
+ Horizontal {
+ alignX = right
+ Field = autoApply
+ Button apply { dependsOn = !autoApply }
+ }
+ }
+ }
+
+} // MLModule PlaneClip
+
+//----------------------------------------------------------------------------------
+// MLModule AnalyzeHeader
+//----------------------------------------------------------------------------------
+MLModule AnalyzeHeader {
+ DLL = "MLImageUtilities"
+ author = "Bart De Dobbelaer"
+ status = "stable"
+ comment = "Parses Analyze Header for scale factor"
+
+ Window {
+ Category {
+ w = 250 mw = 250 pw = 250
+ Field filename { browseButton = YES browseMode = open }
+ Separator { direction = Horizontal }
+ Field funused1 { edit = NO minLength = 10 }
+ Field funused2 { edit = NO minLength = 10 }
+ Field funused3 { edit = NO minLength = 10 }
+ Separator { direction = Horizontal }
+ Field dimensions { edit = NO minLength = 10 }
+ Field voxelSize { edit = NO minLength = 10 }
+ Field origin { edit = NO minLength = 10 }
+ }
+ }
+} // MLModule AnalyzeHeader
+
+//---------------------------------------------------------------------
+// MacroModule LocalAnalyzeLoad
+//----------------------------------------------------------------------------------
+MacroModule LocalAnalyzeLoad {
+ author = "Bart De Dobbelaer"
+ status = "stable"
+ externalDefinition = "$(LOCAL)/LocalAnalyzeLoad/LocalAnalyzeLoad.script"
+} // MacroModule LocalAnalyzeLoad
Added: trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/Images/Screenshots/PlaneClip._default.png
===================================================================
(Binary files differ)
Property changes on: trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/Images/Screenshots/PlaneClip._default.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/PlaneClip.mhelp
===================================================================
--- trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/PlaneClip.mhelp (rev 0)
+++ trunk/Community/General/Modules/ML/MLImageUtilities/mhelp/PlaneClip.mhelp 2012-07-12 12:21:44 UTC (rev 410)
@@ -0,0 +1,173 @@
+ModuleHelp {
+ MetaInformation {
+ definition = Modules/ML/MLImageUtilities/MLImageUtilities.def
+ moduleName = PlaneClip
+ moduleType = MLModule
+ author = "Bart De Dobbelaer"
+ DLL = MLImageUtilities
+ genre = ""
+ keywords = ""
+ seeAlso = ""
+ package = General
+ packageGroup = Community
+ }
+ Purpose {
+ text = "Splits an image in two parts by a plane."
+ }
+ Usage {
+ text = ""
+ }
+ Details {
+ text = "Depending on the chosen Intersection Mode, the output value of voxels intersecting with the plane will differ."
+ }
+ Interaction {
+ text = ""
+ }
+ Tips {
+ text = ""
+ }
+ Windows {
+ text = ""
+ Window _default {
+ title = ""
+ text = ".. screenshot:: _default"
+ }
+ }
+ Inputs {
+ text = ""
+ Field input0 {
+ type = Image
+ text = "Input image"
+ }
+ }
+ Outputs {
+ text = ""
+ Field output0 {
+ type = Image
+ text = "Part of the image that lies in the halfspace of the plane into which the normal of the plane points."
+ }
+ Field output1 {
+ type = Image
+ text = "Other half."
+ }
+ }
+ Parameters {
+ Field instanceName {
+ type = String
+ text = ""
+ title = ""
+ needsDocumentation = No
+ visibleInGUI = No
+ persistent = Yes
+ default = PlaneClip
+ }
+ Field plane {
+ type = Plane
+ text = "Input plane. Should be in the world-coordinates of the input image."
+ title = Plane
+ visibleInGUI = Yes
+ persistent = Yes
+ default = "0 0 1 0"
+ }
+ Field autoApply {
+ type = Bool
+ text = "Auto-apply any changes to the input image or parameters."
+ title = "Auto Apply"
+ visibleInGUI = Yes
+ persistent = Yes
+ default = FALSE
+ }
+ Field apply {
+ type = Trigger
+ text = "Apply changes. Note that disconnecting the image is always applied automatically."
+ title = Apply
+ visibleInGUI = Yes
+ persistent = Yes
+ default = ""
+ }
+ Field intersectionMode {
+ type = Enum
+ text = "Determines what to do with voxel that intersect with the plane."
+ title = "Intersection Mode"
+ visibleInGUI = Yes
+ items {
+ item IntersectionModeMidpoint {
+ title = Midpoint
+ text = "Use the midpoint of the voxel to determine to which side this voxel belongs (default)."
+ deprecatedName = ""
+ }
+ item IntersectionModeVolume {
+ title = Volume
+ text = "Use the percentage of volume to determine on which side this voxel belongs. Estimation of the volume is performed by subsampling the voxel."
+ deprecatedName = ""
+ }
+ item IntersectionModeAntiAliasing {
+ title = "Anti Aliasing"
+ text = "Anti-alias the voxel by subsampling and weighting the voxel-value."
+ deprecatedName = ""
+ }
+ }
+ persistent = Yes
+ default = IntersectionModeMidpoint
+ }
+ Field volumeThreshold {
+ type = Double
+ text = "Volume threshold for :field:`IntersectionModeVolume`"
+ title = "Volume Threshold"
+ visibleInGUI = Yes
+ min = 0
+ max = 1
+ persistent = Yes
+ default = 0.5
+ }
+ Field useGlobalSubsample {
+ type = Bool
+ text = "Use the global subsample value."
+ title = "Use Global Subsample"
+ visibleInGUI = Yes
+ persistent = Yes
+ default = TRUE
+ }
+ Field globalSubsample {
+ type = Integer
+ text = "Global subsample value. Each voxel is subsampled with this value in the x, y, and z directions."
+ title = Subsample
+ visibleInGUI = Yes
+ min = 1
+ max = 6
+ persistent = Yes
+ default = 4
+ }
+ Field xSubsample {
+ type = Integer
+ text = "Specific subsample for the x-direction."
+ title = X
+ visibleInGUI = Yes
+ min = 1
+ max = 6
+ persistent = Yes
+ default = 4
+ }
+ Field ySubsample {
+ type = Integer
+ text = "Specific subsample for the y-direction."
+ title = Y
+ visibleInGUI = Yes
+ min = 1
+ max = 6
+ persistent = Yes
+ default = 4
+ }
+ Field zSubsample {
+ type = Integer
+ text = "Specific subsample for the z-direction."
+ title = Z
+ visibleInGUI = Yes
+ min = 1
+ max = 6
+ persistent = Yes
+ default = 4
+ }
+ text = ""
+ }
+}
Modified: trunk/Community/General/Sources/ML/MLImageUtilities/MLImageUtilities.pro
===================================================================
--- trunk/Community/General/Sources/ML/MLImageUtilities/MLImageUtilities.pro 2012-05-09 06:47:09 UTC (rev 409)
+++ trunk/Community/General/Sources/ML/MLImageUtilities/MLImageUtilities.pro 2012-07-12 12:21:44 UTC (rev 410)
@@ -6,6 +6,10 @@
DESTDIR = ../../../lib
DLLDESTDIR = ../../../lib
+# Set high warn level (warn 4 on MSVC)
+WARN = HIGH
+
+# Add used projects here (see included pri files below for available projects)
CONFIG += dll ML MLTools
MLAB_PACKAGES += MeVisLab_Standard
@@ -16,6 +20,9 @@
DEFINES += MLIMAGEUTILITIES_EXPORTS
+# Enable ML deprecated API warnings. To completely disable the deprecated API, change WARN to DISABLE.
+DEFINES += ML_WARN_DEPRECATED
+
MSVC_USE_SUBDIRS = 1
HEADERS += \
@@ -31,6 +38,7 @@
PlaneClip/PlaneClip.cpp \
AnalyzeHeader/AnalyzeHeader.cpp \
MIP/MIP.cpp
-
+
+# additional files that are NOT compiled
RELATEDFILES += \
- ../../MLabModules/MLImageUtilities/MLImageUtilities.def
+ ../../../Modules/ML/MLImageUtilities/MLImageUtilities.def
Modified: trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.cpp 2012-05-09 06:47:09 UTC (rev 409)
+++ trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.cpp 2012-07-12 12:21:44 UTC (rev 410)
@@ -1,121 +1,278 @@
-
-/*
- This program is written by:
-
- Bart De Dobbelaer
-
- Laboratory for Medical Imaging Research
- Radiologie/ESAT PSI
- Universitair Ziekenhuis Gasthuisberg
- Herestraat 49
- B-3000 Leuven
- Belgium
-
- Email: Bar...@uz...
-*/
-
-#include "PlaneClip.h"
-
-ML_START_NAMESPACE
-
-////////////////////////////////////////////////////////////////////////
-
-ML_BASEOP_CLASS_SOURCE(PlaneClip, BaseOp);
-
-PlaneClip::PlaneClip() : BaseOp(1, 2) {
- ML_TRACE_IN("PlaneClip::PlaneClip()")
- handleNotificationOff();
-
- (_planeFld = (PlaneField *)(getFieldContainer()->addField("plane","PlaneField","0,0,1,0")))->setPlaneValue(Plane());
-
- (_autoApplyFld = getFieldContainer()->addBool("autoApply"))->setBoolValue(false);
- _applyFld = getFieldContainer()->addNotify("apply");
-
- handleNotificationOn();
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void PlaneClip::handleNotification (Field *field) {
- ML_TRACE_IN("PlaneClip::handleNotification()")
- if (field == _applyFld ||
- (_autoApplyFld->getBoolValue() && (
- field == _planeFld ||
- field == getInField(0)))
- ) {
- getOutField(0)->notifyAttachments();
- getOutField(1)->notifyAttachments();
- }
- BaseOp::handleNotification(field);
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void PlaneClip::activateAttachments () {
- ML_TRACE_IN("PlaneClip::handleNotification()")
- BaseOp::activateAttachments();
-}
-
-////////////////////////////////////////////////////////////////////////
-
-void PlaneClip::calcOutImageProps (int outIndex) {
- ML_TRACE_IN("PlaneClip::calcOutImageProps ()")
-
- PagedImg *inImg=getUpdatedInImg(0);
- if (inImg) {
- getOutImg(outIndex)->setImgExt(inImg->getImgExt());
- getOutImg(outIndex)->setPageExt(inImg->getPageExt());
- getOutImg(outIndex)->setVoxelSize(inImg->getVoxelSize());
- getOutImg(outIndex)->setMinVoxelValue(inImg->getMinVoxelValue());
- getOutImg(outIndex)->setMaxVoxelValue(inImg->getMaxVoxelValue());
- getOutImg(outIndex)->setDataType(inImg->getDataType());
- getOutImg(outIndex)->setUpToDate();
- } else getOutImg(outIndex)->setOutOfDate();
-}
-
-////////////////////////////////////////////////////////////////////////
-
-SubImgBox PlaneClip::calcInSubImageBox (int , const SubImgBox &outSubImgBox, int ) {
- ML_TRACE_IN("PlaneClip::calcInSubImageBox ()")
-
- return outSubImgBox;
-}
-
-////////////////////////////////////////////////////////////////////////
-
-CALC_OUTSUBIMAGE1_CPP(PlaneClip);
-
-template <typename T>
-void PlaneClip::calcOutSubImage (TSubImg<T> *outSubImg, int outIndex, TSubImg<T> *inSubImg) {
- ML_TRACE_IN("template <typename T> PlaneClip::calcOutSubImage ()")
-
- SubImgBox inbox = inSubImg->getBox();
- SubImgBox outbox = outSubImg->getBox();
- inbox = SubImgBox::intersect(inbox, getInImg(0)->getBoxFromImgExt());
- Vector p = inbox.v1;
- Plane plane = Plane(); _planeFld->getPlaneValue(plane);
- vec3 pos;
-
- for (p.u = inbox.v1.u; p.u <= inbox.v2.u; p.u++) {
- for (p.t = inbox.v1.t; p.t <= inbox.v2.t; p.t++) {
- for (p.c = inbox.v1.c; p.c <= inbox.v2.c; p.c++) {
- for (p.z = inbox.v1.z; p.z <= inbox.v2.z; p.z++) {
- for (p.y = inbox.v1.y; p.y <= inbox.v2.y; p.y++) {
- for (p.x = inbox.v1.x; p.x <= inbox.v2.x; p.x++) {
- pos = vec3(p.x,p.y,p.z);
- if (plane.isInHalfSpace(pos)) {
- outSubImg->setImgVal(p,(outIndex == 0) ? inSubImg->getImgVal(p) : (T)0);
- } else {
- outSubImg->setImgVal(p,(outIndex == 0) ? (T)0 : inSubImg->getImgVal(p));
- }
- }
- }
- }
- }
- }
- }
-}
-
-////////////////////////////////////////////////////////////////////////
-
-ML_END_NAMESPACE
+//----------------------------------------------------------------------------------
+//! The ML module class PlaneClip.
+/*!
+// \file mlPlaneClip.cpp
+// \author Bart De Dobbelaer, Hugo Kuijf
+// \date 2012-07-11
+//
+//
+*/
+//----------------------------------------------------------------------------------
+/*
+ This program is written by:
+
+ Bart De Dobbelaer
+
+ Laboratory for Medical Imaging Research
+ Radiologie/ESAT PSI
+ Universitair Ziekenhuis Gasthuisberg
+ Herestraat 49
+ B-3000 Leuven
+ Belgium
+
+ Email: Bar...@uz...
+*/
+
+// Local includes
+#include "PlaneClip.h"
+
+#include <mlTypedHandlers.h>
+
+ML_START_NAMESPACE
+
+ //! The PlaneClipHandler handles the page calculation of an output image of PlaneClip.
+ //! It should copy all required state from PlaneClip or the output image in its
+ //! constructor and should not keep a reference to the output image nor the module itself.
+ //! This facilitates to implement a thread-safe handler, which does not access non-threadsafe shared data.
+class PlaneClipHandler : public TypedCalculateOutputImageHandler<PlaneClipHandler,
+ /* numInputs = */ 1,
+ /* MLVariableType0 = */ ScalarTypes>
+{
+
+public:
+ //! Template configuration of the output/input sub images.
+ enum {
+ OutputSubImage_Type = MLVariableType0,
+ InputSubImage0_Type = MLVariableType0,
+ InputSubImage0_ReadOnly = true
+ };
+
+private:
+ // Handler state:
+ const MLint _outputIndex;
+ const Plane _plane;
+ const Matrix4& _voxelToWorldMatrix;
+ const MLint _intersectionMode;
+ const MLdouble _volumeThreshold;
+ const bool _useGlobalSubsample;
+ const MLuint _globalSubsample;
+ const MLuint _xSubsample;
+ const MLuint _ySubsample;
+ const MLuint _zSubsample;
+
+public:
+ //----------------------------------------------------------------------------------
+ //! Construct a new handler for given \p outputImage and given module state.
+ //! Do not keep references to the outputImage or the module, copy the needed state
+ //! instead.
+ //----------------------------------------------------------------------------------
+ PlaneClipHandler(const PagedImage& outputImage, const PlaneClip& module)
+ : _outputIndex(outputImage.getOutputIndex()),
+ _plane(module._planeFld->getPlaneValue()),
+ _voxelToWorldMatrix(outputImage.getVoxelToWorldMatrix()),
+ _intersectionMode(module._intersectionModeFld->getEnumValue()),
+ _volumeThreshold(module._volumeThresholdFld->getDoubleValue()),
+ _useGlobalSubsample(module._useGlobalSubsampleFld->getBoolValue()),
+ _globalSubsample(module._globalSubsampleFld->getIntValue()),
+ _xSubsample(module._xSubsampleFld->getIntValue()),
+ _ySubsample(module._ySubsampleFld->getIntValue()),
+ _zSubsample(module._zSubsampleFld->getIntValue())
+ { }
+
+ //----------------------------------------------------------------------------------
+ //! Templated output page calculation.
+ //----------------------------------------------------------------------------------
+ template <typename OUTTYPE>
+ void typedCalculateOutputSubImage(TSubImage<OUTTYPE>& outputSubImage,
+ const TSubImage<OUTTYPE>& inputSubImage0,
+ UserThreadData* /*userThreadData*/)
+ {
+ // Compute outSubImage from inSubImage[0-N].
+
+ // Clamp box of output image against image extent to avoid that unused areas are processed.
+ const SubImageBox validOutBox = outputSubImage.getValidRegion();
+
+ // Const variables used for volume or anti-aliasing.
+ const MLuint nx(_useGlobalSubsample ? _globalSubsample : _xSubsample);
+ const MLuint ny(_useGlobalSubsample ? _globalSubsample : _ySubsample);
+ const MLuint nz(_useGlobalSubsample ? _globalSubsample : _zSubsample);
+ const MLdouble subsampleSize(MLdouble(nx*ny*nz));
+ const MLdouble xStep(1. / (2. * nx));
+ const MLdouble yStep(1. / (2. * ny));
+ const MLdouble zStep(1. / (2. * nz));
+
+ // Process all voxels of the valid region of the output page.
+ ImageVector p;
+ for (p.u=validOutBox.v1.u; p.u<=validOutBox.v2.u; ++p.u) {
+ for (p.t=validOutBox.v1.t; p.t<=validOutBox.v2.t; ++p.t) {
+ for (p.c=validOutBox.v1.c; p.c<=validOutBox.v2.c; ++p.c) {
+ for (p.z=validOutBox.v1.z; p.z<=validOutBox.v2.z; ++p.z) {
+ for (p.y=validOutBox.v1.y; p.y<=validOutBox.v2.y; ++p.y) {
+
+ p.x = validOutBox.v1.x;
+ // Get pointers to row starts of input and output subimages.
+ const OUTTYPE* inVoxel0 = inputSubImage0.getImagePointer(p);
+
+ OUTTYPE* outVoxel = outputSubImage.getImagePointer(p);
+
+ const MLint rowEnd = validOutBox.v2.x;
+
+ // Process all row voxels.
+ for (; p.x <= rowEnd; ++p.x, ++outVoxel, ++inVoxel0)
+ {
+ // For the anti-aliasing computation, it only makes sense if the current voxel is close to the plane. If the
+ // distance is too large, the plane does not intersect the voxel. Then, no computation is needed anyway and
+ // we fall back to midpoint (default).
+ const Vector3 voxelCenter(_voxelToWorldMatrix.transformPoint(Vector3(MLdouble(p.x) + 0.5, MLdouble(p.y) + 0.5, MLdouble(p.z) + 0.5)));
+
+ MLint currentIntersectionMode = _intersectionMode;
+ if (_intersectionMode == 1 || _intersectionMode == 2) { // Volume or midpoint
+ const MLdouble distance = mlAbs(_plane.getDistance(voxelCenter));
+
+ // Check if the plane intersects the current voxel. If the distance from the voxelCenter to the plane is
+ // smaller than the distance from voxelOrigin to voxelCenter, the plane is in the voxel.
+ const Vector3 voxelOrigin(_voxelToWorldMatrix.transformPoint(Vector3(MLdouble(p.x), MLdouble(p.y), MLdouble(p.z))));
+ if (distance > voxelOrigin.distance(voxelCenter)) {
+ // No intersection, fall back to midpoint
+ currentIntersectionMode = 0;
+ }
+ }
+
+ switch (currentIntersectionMode) {
+ case 0: // Midpoint
+ if (_plane.isInHalfSpace(voxelCenter)) {
+ *outVoxel = (_outputIndex == 0) ? *inVoxel0 : OUTTYPE(0);
+ } else {
+ *outVoxel = (_outputIndex == 0) ? OUTTYPE(0) : *inVoxel0;
+ }
+ break;
+ case 1:
+ case 2:
+ {
+ // Divide the voxel in n x n x n boxes and test each component individually against the plane.
+ MLuint count(0);
+
+ for (MLuint z(0); z < nz; ++z) {
+ for (MLuint y(0); y < ny; ++y) {
+ for (MLuint x(0); x < nx; ++x) {
+ const MLdouble newX = MLdouble(p.x) + MLdouble(x) / nx + xStep;
+ const MLdouble newY = MLdouble(p.y) + MLdouble(y) / ny + yStep;
+ const MLdouble newZ = MLdouble(p.z) + MLdouble(z) / nz + zStep;
+
+ if (_plane.isInHalfSpace(_voxelToWorldMatrix.transformPoint(Vector3(newX, newY, newZ)))) {
+ count += (_outputIndex == 0) ? 1 : 0;
+ } else {
+ count += (_outputIndex == 0) ? 0 : 1;
+ }
+ }
+ }
+ }
+
+ const MLdouble percentage(MLdouble(count) / subsampleSize); // [0..1]
+
+ if (currentIntersectionMode == 1) { // Volume
+ *outVoxel = (percentage >= _volumeThreshold) ? *inVoxel0 : 0;
+ }
+ if (currentIntersectionMode == 2) { // AntiAliasing
+ *outVoxel = OUTTYPE(*inVoxel0 * percentage);
+ }
+ }
+ break;
+ default:
+ // This should never occur
+ mlFatalError("PlaneClipHandler::typedCalculateOutputSubImage", ML_PROGRAMMING_ERROR);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private:
+ PlaneClipHandler& operator= (const PlaneClipHandler&) { }
+};
+
+
+//! Implements code for the runtime type system of the ML
+ML_MODULE_CLASS_SOURCE(PlaneClip, Module);
+
+//----------------------------------------------------------------------------------
+//! Constructor
+//----------------------------------------------------------------------------------
+PlaneClip::PlaneClip() : Module(1, 2)
+{
+ // See section 'Implementing the Constructor()' in ML Programming Guide for details.
+ // Suppress calls of handleNotification on field changes to
+ // avoid side effects during initialization phase.
+ handleNotificationOff();
+
+ // Add fields to the module and set their values.
+ _planeFld = addPlane("plane", Plane());
+ _autoApplyFld = addBool("autoApply", false);
+ _applyFld = addNotify("apply");
+
+ std::vector<std::string> intersectionMode;
+ intersectionMode.push_back("IntersectionModeMidpoint");
+ intersectionMode.push_back("IntersectionModeVolume");
+ intersectionMode.push_back("IntersectionModeAntiAliasing");
+
+ _intersectionModeFld = addEnum("intersectionMode", intersectionMode);
+
+ _volumeThresholdFld = addDouble("volumeThreshold", 0.5);
+
+ _useGlobalSubsampleFld = addBool("useGlobalSubsample", true);
+ _globalSubsampleFld = addInt("globalSubsample", 4);
+ _xSubsampleFld = addInt("xSubsample", 4);
+ _ySubsampleFld = addInt("ySubsample", 4);
+ _zSubsampleFld = addInt("zSubsample", 4);
+
+ // Reactivate calls of handleNotification on field changes.
+ handleNotificationOn();
+}
+
+//----------------------------------------------------------------------------------
+//! Handle field changes of the field field.
+//----------------------------------------------------------------------------------
+void PlaneClip::handleNotification(Field *field)
+{
+ bool touchOutputs = false;
+
+ if (field == _applyFld) {
+ touchOutputs = true;
+ } if (_autoApplyFld->getBoolValue()) {
+ touchOutputs = true;
+ } if (isInputImageField(field) && getUpdatedInputImage(0) == NULL) {
+ touchOutputs = true;
+ }
+
+ if (touchOutputs) {
+ // Touch all output image fields to notify connected modules.
+ touchOutputImageFields();
+ }
+}
+
+//----------------------------------------------------------------------------------
+//! Sets properties of the output image at output outputIndex.
+//----------------------------------------------------------------------------------
+void PlaneClip::calculateOutputImageProperties(int /*outputIndex*/, PagedImage* outputImage)
+{
+ // Setup datatypes and read-only flags of output image and input subimages.
+ PlaneClipHandler::setupKnownProperties(outputImage);
+
+ // Verify if the input/output datatypes are supported by our handler.
+ // This will invalidate the output image if the type combination is not supported by the handler.
+ PlaneClipHandler::verifyProperties(outputImage);
+}
+
+//----------------------------------------------------------------------------------
+//! Creates the PlaneClipHandler for the given output image whenever calculateOutputImageProperties()
+//! is called and the outputImage is valid.
+//----------------------------------------------------------------------------------
+CalculateOutputImageHandler* PlaneClip::createCalculateOutputImageHandler(PagedImage* outputImage)
+{
+ return new PlaneClipHandler(*outputImage, *this);
+}
+
+ML_END_NAMESPACE
\ No newline at end of file
Modified: trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.h
===================================================================
--- trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.h 2012-05-09 06:47:09 UTC (rev 409)
+++ trunk/Community/General/Sources/ML/MLImageUtilities/PlaneClip/PlaneClip.h 2012-07-12 12:21:44 UTC (rev 410)
@@ -1,6 +1,13 @@
-//! The ML module class PlaneClip to intersect an image with a plane.
-//! \file AnalyzeHeader.h
-//! \author Bart De Dobbelaer
+//----------------------------------------------------------------------------------
+//! The ML module class PlaneClip.
+/*!
+// \file mlPlaneClip.h
+// \author Bart De Dobbelaer, Hugo Kuijf
+// \date 2012-07-11
+//
+//
+*/
+//----------------------------------------------------------------------------------
/*
This program is written by:
@@ -16,41 +23,80 @@
Email: Bar...@uz...
*/
-////////////////////////////////////////////////////////////////////////
-
-#ifndef __mlPlaneClip_H__
-#define __mlPlaneClip_H__
-
-#include "../MLImageUtilitiesSystem.h"
-#include "mlOperatorIncludes.h"
-
-#include "mlPlaneField.h"
-
-ML_START_NAMESPACE
-
-////////////////////////////////////////////////////////////////////////
-
-//! The ML module class PlaneClip to intersect an image with a plane.
-class MLIMAGEUTILITIES_EXPORT PlaneClip : public BaseOp {
-public:
- PlaneClip();
- virtual void handleNotification (Field *field);
- virtual void activateAttachments();
- virtual void calcOutImageProps (int outIndex);
- virtual SubImgBox calcInSubImageBox (int inIndex, const SubImgBox &outSubImgBox, int outIndex);
- virtual void calcOutSubImage (SubImg *outSubImg, int outIndex, SubImg *inSubImgs);
- template <typename T>
- void calcOutSubImage (TSubImg<T> *outSubImg, int outIndex,
- TSubImg<T> *inSubImg);
-private:
- PlaneField *_planeFld;
- BoolField *_autoApplyFld;
- NotifyField *_applyFld;
- ML_BASEOP_CLASS_HEADER(PlaneClip)
-};
-
-////////////////////////////////////////////////////////////////////////
-
-ML_END_NAMESPACE
-
-#endif
+#ifndef __mlPlaneClip_H
+#define __mlPlaneClip_H
+
+
+// Local includes
+#include "../MLImageUtilitiesSystem.h"
+
+// ML includes
+#include <mlModuleIncludes.h>
+
+ML_START_NAMESPACE
+
+
+//! Clips an image with the given plane.
+class MLIMAGEUTILITIES_EXPORT PlaneClip : public Module
+{
+public:
+
+ //! Constructor.
+ PlaneClip ();
+
+ //! Handles field changes of the field \p field.
+ virtual void handleNotification (Field *field);
+
+ // ----------------------------------------------------------
+ //! \name Image processing methods.
+ //@{
+ // ----------------------------------------------------------
+
+ //! Sets properties of the output image at output \p outputIndex.
+ virtual void calculateOutputImageProperties (int outputIndex, PagedImage* outputImage);
+
+ //! Creates the PlaneClipHandler for the given output image whenever calculateOutputImageProperties()
+ //! is called and the outputImage is valid.
+ virtual CalculateOutputImageHandler* createCalculateOutputImageHandler(PagedImage* outputImage);
+
+private:
+
+ // ----------------------------------------------------------
+ //! \name Module field declarations
+ //@{
+ // ----------------------------------------------------------
+
+ //! Plane
+ PlaneField *_planeFld;
+ //! Auto apply changes
+ BoolField *_autoApplyFld;
+ //! Apply changes when auto-apply is Off
+ NotifyField *_applyFld;
+ //!
+ EnumField *_intersectionModeFld;
+ //!
+ DoubleField *_volumeThresholdFld;
+ //!
+ BoolField *_useGlobalSubsampleFld;
+ //!
+ IntField *_globalSubsampleFld;
+ //!
+ IntField *_xSubsampleFld;
+ //!
+ IntField *_ySubsampleFld;
+ //!
+ IntField *_zSubsampleFld;
+ //@}
+
+ // Make the handler a friend so that it can access the private data
+ // in its constructor.
+ friend class PlaneClipHandler;
+
+ // Implements interface for the runtime type system of the ML.
+ ML_MODULE_CLASS_HEADER(PlaneClip)
+};
+
+
+ML_END_NAMESPACE
+
+#endif // __mlPlaneClip_H
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bar...@us...> - 2012-05-09 06:47:15
|
Revision: 409
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=409&view=rev
Author: bartdedobbelaer
Date: 2012-05-09 06:47:09 +0000 (Wed, 09 May 2012)
Log Message:
-----------
- Module already exists in MeVisLab standard distribution
Modified Paths:
--------------
trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def
Modified: trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def
===================================================================
--- trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def 2012-03-05 16:44:30 UTC (rev 408)
+++ trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def 2012-05-09 06:47:09 UTC (rev 409)
@@ -7,7 +7,7 @@
// \date 08/09
*/
//----------------------------------------------------------------------------------
-
+/*
MacroModule LoadAny {
genre = File
externalDefinition = $(LOCAL)/LoadAny.script
@@ -19,3 +19,4 @@
documentation = $(LOCAL)/html/LoadAny.html
examplenetwork = $(LOCAL)/networks/LoadAny.mlab
}
+*/
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rha...@us...> - 2012-03-05 16:44:40
|
Revision: 408
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=408&view=rev
Author: rhameeteman
Date: 2012-03-05 16:44:30 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
KH.
* If autoUpdate is on or apply is pressed and either input is not valid, the statistics are now reset to their default value. Previously they were not changed, which leads to invalid values.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.cpp
trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.h
Modified: trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.cpp
===================================================================
--- trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.cpp 2012-03-02 15:38:20 UTC (rev 407)
+++ trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.cpp 2012-03-05 16:44:30 UTC (rev 408)
@@ -105,8 +105,12 @@
{
ML_TRACE_IN("SegmentationEvaluationMetric::handleNotification ()");
- if (getUpdatedInImg(0) && getUpdatedInImg(1) && (_isAutoApplyFld->isOn() || (field == _applyFld))) {
- _process();
+ if (_isAutoApplyFld->isOn() || (field == _applyFld)) {
+ if (getUpdatedInImg(0) && getUpdatedInImg(1) ) {
+ _process();
+ } else {
+ _reset();
+ }
}
}
@@ -119,6 +123,7 @@
// Update members to new field state here.
// Call super class functionality to enable notification handling again.
+ handleNotification(NULL);
BaseOp::activateAttachments ();
}
@@ -292,5 +297,24 @@
_cFactorFld->setDoubleValue(cFactor);
}
+//----------------------------------------------------------------------------------
+//! Reset parameters
+//----------------------------------------------------------------------------------
+void SegmentationEvaluationMetric::_reset()
+{
+ ML_TRACE_IN("SegmentationEvaluationMetric::_reset()");
+
+ _truePositiveFld->setIntValue(0);
+ _trueNegativeFld->setIntValue(0);
+ _falsePositiveFld->setIntValue(0);
+ _falseNegativeFld->setIntValue(0);
+ _sensitivityFld->setDoubleValue(0.0);
+ _specificityFld->setDoubleValue(0.0);
+ _prevalenceFld->setDoubleValue(0.0);
+ _levelOfTestFld->setDoubleValue(0.0);
+ _diceSimilarityCoefficientFld->setDoubleValue(0.0);
+ _cFactorFld->setDoubleValue(0.0);
+}
+
ML_END_NAMESPACE
Modified: trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.h
===================================================================
--- trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.h 2012-03-02 15:38:20 UTC (rev 407)
+++ trunk/Community/General/Sources/ML/CVLSegmentationEvaluationMetric/mlSegmentationEvaluationMetric.h 2012-03-05 16:44:30 UTC (rev 408)
@@ -65,6 +65,9 @@
//! Main routine.
void _process();
+ //! reset parameters on empty input
+ void _reset();
+
//! Number of true positives.
unsigned int _numTruePositive;
//! Number of true negatives.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wol...@us...> - 2012-03-02 15:38:31
|
Revision: 407
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=407&view=rev
Author: wolfspindler
Date: 2012-03-02 15:38:20 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Some backward compatible ports for MeVisLab2.3.
Modified Paths:
--------------
trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp
Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp
===================================================================
--- trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp 2012-03-02 11:12:26 UTC (rev 406)
+++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/CSOSetProperties/mlCSOSetProperties.cpp 2012-03-02 15:38:20 UTC (rev 407)
@@ -269,7 +269,10 @@
m_InputCSOList->removeNotificationObserver(CSOListNotifyObserverCB, this);
}
if (!f_WorkDirectlyOnInputList->getBoolValue()){
+#if MEVISLAB_VERSION < 203
ML_DELETE(m_OutputCSOList);
+#endif
+ m_OutputCSOList = NULL;
}
}
@@ -301,7 +304,10 @@
bool hasChangedToOn = f_WorkDirectlyOnInputList->getBoolValue();
if (m_InputCSOList != NULL){
if (hasChangedToOn){
+#if MEVISLAB_VERSION < 203
ML_DELETE(m_OutputCSOList);
+#endif
+ m_OutputCSOList = NULL;
m_OutputCSOList = m_InputCSOList;
} else {
ML_CHECK_NEW(m_OutputCSOList, CSOList(*m_InputCSOList));
@@ -309,7 +315,10 @@
} else { // no input, nothing to put out
if (hasChangedToOn){
if (m_OutputCSOList != NULL){
+#if MEVISLAB_VERSION < 203
ML_DELETE(m_OutputCSOList);
+#endif
+ m_OutputCSOList = NULL;
}
}
m_OutputCSOList = NULL;
@@ -345,13 +354,18 @@
if (workDirectlyOnInputCSOList){
m_OutputCSOList = NULL;
} else {
+#if MEVISLAB_VERSION < 203
ML_DELETE(m_OutputCSOList);
+#endif
m_OutputCSOList = NULL;
}
}
if (m_InputCSOList != NULL){
if (!workDirectlyOnInputCSOList){ // make copy
+#if MEVISLAB_VERSION < 203
ML_DELETE(m_OutputCSOList);
+#endif
+ m_OutputCSOList = NULL;
ML_CHECK_NEW(m_OutputCSOList, CSOList(*m_InputCSOList));
} else { // use pointer
m_OutputCSOList = m_InputCSOList;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wol...@us...> - 2012-03-02 11:12:32
|
Revision: 406
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=406&view=rev
Author: wolfspindler
Date: 2012-03-02 11:12:26 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Ignoring MeVisLabHUB according to discussion with Felix (awakeideas)
Modified Paths:
--------------
trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt
Modified: trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt
===================================================================
--- trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt 2012-03-02 10:33:03 UTC (rev 405)
+++ trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt 2012-03-02 11:12:26 UTC (rev 406)
@@ -27,4 +27,5 @@
# Mac OS X only projects
-Sources/ML/MLOsiriXImporter/* windows,linux
+Sources/ML/MLOsiriXImporter/* windows,linux
+Sources/ML/MLOsiriXImporter/MLOsiriXImporter/MeVisLabHub/* windows,linux,mac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wol...@us...> - 2012-03-02 10:33:12
|
Revision: 405
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=405&view=rev
Author: wolfspindler
Date: 2012-03-02 10:33:03 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
Trial to fix platform incompatibility
Modified Paths:
--------------
trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMinimalDistance.cpp
Modified: trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMinimalDistance.cpp
===================================================================
--- trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMinimalDistance.cpp 2012-03-02 10:31:55 UTC (rev 404)
+++ trunk/UMD/METK/Sources/Inventor/UMDSoMeasurement/UMDMinimalDistance.cpp 2012-03-02 10:33:03 UTC (rev 405)
@@ -1,5 +1,6 @@
#include "UMDMinimalDistance.h"
+#include <assert.h>
// #########################################
// #####
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
