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: <tm...@us...> - 2009-09-02 14:51:13
|
Revision: 204 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=204&view=rev Author: tmoench Date: 2009-09-02 14:51:06 +0000 (Wed, 02 Sep 2009) Log Message: ----------- Two changes to enable referencing from other packages: - Added export to MinimalDistancePointClouds.h - Added project MLCSOCommunityModules to Community_General.pri Modified Paths: -------------- trunk/Community/General/Configuration/Community_General.pri trunk/Community/General/Sources/ML/MLCSOCommunityModules/MinimalDistancePointClouds/MinimalDistancePointClouds.h Modified: trunk/Community/General/Configuration/Community_General.pri =================================================================== --- trunk/Community/General/Configuration/Community_General.pri 2009-09-02 11:53:16 UTC (rev 203) +++ trunk/Community/General/Configuration/Community_General.pri 2009-09-02 14:51:06 UTC (rev 204) @@ -44,6 +44,15 @@ # -- ML Projects ------------------------------------------------------------- +MLCSOCommunityModules { + CONFIG_FOUND += MLCSOCommunityModules + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLCSOCommunityModules + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLCSOCommunityModules/CSODistance + INCLUDEPATH += $${PACKAGE_SOURCES}/ML/MLCSOCommunityModules/MinimalDistancePointClouds + win32:LIBS += MLCSOCommunityModules$${d}.lib + unix:LIBS += -lMLCSOCommunityModules$${d} +} + # -- Inventor Projects ------------------------------------------------------- # -- Shared Projects --------------------------------------------------------- Modified: trunk/Community/General/Sources/ML/MLCSOCommunityModules/MinimalDistancePointClouds/MinimalDistancePointClouds.h =================================================================== --- trunk/Community/General/Sources/ML/MLCSOCommunityModules/MinimalDistancePointClouds/MinimalDistancePointClouds.h 2009-09-02 11:53:16 UTC (rev 203) +++ trunk/Community/General/Sources/ML/MLCSOCommunityModules/MinimalDistancePointClouds/MinimalDistancePointClouds.h 2009-09-02 14:51:06 UTC (rev 204) @@ -37,7 +37,7 @@ //! The MinimalDistancePointClouds implements //! a fast nearest pair search algorithm described by Sean Quinlan //! in 'Efficient Distance Computation between Non-Convex Objects'. -class MinimalDistancePointClouds +class MLCSOCOMMUNITYMODULES_EXPORT MinimalDistancePointClouds { public: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bro...@us...> - 2009-09-02 11:53:23
|
Revision: 203 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=203&view=rev Author: broersen Date: 2009-09-02 11:53:16 +0000 (Wed, 02 Sep 2009) Log Message: ----------- BUG: -Changed 'real32_T' into 'float' type ENH: -Added extra check on maximum number of dimensions in MATLAB image Modified Paths: -------------- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp =================================================================== --- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2009-08-24 17:02:16 UTC (rev 202) +++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2009-09-02 11:53:16 UTC (rev 203) @@ -68,6 +68,7 @@ _outputXMarkerListFld = fields->addBase("outputXMarkerList"); _outputXMarkerListFld->setBaseValue(&_outputXMarkerList); + //! Use matlab commands in text field. (_matlabScriptFld = fields->addString("matlabScript"))->setStringValue("Output0=Input0 % Type your matlab script here."); //! Use external matlab script. @@ -76,7 +77,6 @@ //! Where will matlab script be dumped. (_matlabScriptPathFld = fields->addString("matlabScriptPath"))->setStringValue(""); - //! Set input and output data names used in matlab. (_inDataNameFld[0] = fields->addString("inDataName0"))->setStringValue("Input0"); (_inDataNameFld[1] = fields->addString("inDataName1"))->setStringValue("Input1"); @@ -177,7 +177,7 @@ _statusFld->setStringValue("Cannot find Matlab engine!"); } } else { - std::cout << "Matlab is already started"; + _statusFld->setStringValue("Matlab is already started"); } } @@ -188,7 +188,7 @@ engSetVisible(m_pEngine, false); } } - + // Update output only if autoapply is enabled. if ( ((field == getInField(0))||(field == getInField(1))||(field == getInField(2))) && (_autoCalculationFld->isOn()) || (field == _calculateFld) ) { @@ -306,41 +306,30 @@ if(m_pImage != NULL) { const mwSize m_numDims = mxGetNumberOfDimensions(m_pImage); + if(m_numDims>6) { + std::cerr << "calcOutImageProps(): Too many dimensions in Matlab image!" << std::endl << std::flush; + return; + } Vector outExt = Vector(1,1,1,1,1,1); for (size_t i=0; i<m_numDims; i++) { outExt[i] = static_cast<MLint>(mxGetDimensions(m_pImage)[i]); } + // Set page size. getOutImg(outIndex)->setPageExt(outExt); // Set output image size. getOutImg(outIndex)->setImgExt(outExt); // Set output image datatype. switch (mxGetClassID(m_pImage)) { - case mxDOUBLE_CLASS: - getOutImg(outIndex)->setDataType(MLdoubleType); - break; - case mxSINGLE_CLASS: - getOutImg(outIndex)->setDataType(MLfloatType); - break; - case mxINT8_CLASS: - getOutImg(outIndex)->setDataType(MLint8Type); - break; - case mxUINT8_CLASS: - getOutImg(outIndex)->setDataType(MLuint8Type); - break; - case mxINT16_CLASS: - getOutImg(outIndex)->setDataType(MLint16Type); - break; - case mxUINT16_CLASS: - getOutImg(outIndex)->setDataType(MLuint16Type); - break; - case mxINT32_CLASS: - getOutImg(outIndex)->setDataType(MLint32Type); - break; - case mxUINT32_CLASS: - getOutImg(outIndex)->setDataType(MLuint32Type); - break; + case mxDOUBLE_CLASS: getOutImg(outIndex)->setDataType(MLdoubleType); break; + case mxSINGLE_CLASS: getOutImg(outIndex)->setDataType(MLfloatType); break; + case mxINT8_CLASS: getOutImg(outIndex)->setDataType(MLint8Type); break; + case mxUINT8_CLASS: getOutImg(outIndex)->setDataType(MLuint8Type); break; + case mxINT16_CLASS: getOutImg(outIndex)->setDataType(MLint16Type); break; + case mxUINT16_CLASS: getOutImg(outIndex)->setDataType(MLuint16Type); break; + case mxINT32_CLASS: getOutImg(outIndex)->setDataType(MLint32Type); break; + case mxUINT32_CLASS: getOutImg(outIndex)->setDataType(MLuint32Type); break; case mxINT64_CLASS: // Matlab does not support basic operations on this type //getOutImg(outIndex)->setDataType(MLint64Type); //break; @@ -422,30 +411,14 @@ // Copy different types of images from Matlab. MLPhysicalDataType outputClass; switch (mxGetClassID(m_pImage)) { - case mxDOUBLE_CLASS: - outputClass = MLdoubleType; - break; - case mxSINGLE_CLASS: - outputClass = MLfloatType; - break; - case mxINT8_CLASS: - outputClass = MLint8Type; - break; - case mxUINT8_CLASS: - outputClass = MLuint8Type; - break; - case mxINT16_CLASS: - outputClass = MLint16Type; - break; - case mxUINT16_CLASS: - outputClass = MLuint16Type; - break; - case mxINT32_CLASS: - outputClass = MLint32Type; - break; - case mxUINT32_CLASS: - outputClass = MLuint32Type; - break; + case mxDOUBLE_CLASS: outputClass = MLdoubleType; break; + case mxSINGLE_CLASS: outputClass = MLfloatType; break; + case mxINT8_CLASS: outputClass = MLint8Type; break; + case mxUINT8_CLASS: outputClass = MLuint8Type; break; + case mxINT16_CLASS: outputClass = MLint16Type; break; + case mxUINT16_CLASS: outputClass = MLuint16Type; break; + case mxINT32_CLASS: outputClass = MLint32Type; break; + case mxUINT32_CLASS: outputClass = MLuint32Type; break; case mxINT64_CLASS: // Matlab does not support basic operations on this type //outputClass = MLint64Type; //break; @@ -524,42 +497,15 @@ mxClassID inputClass; int elementSize; switch (inImg->getDataType()) { - case MLdoubleType: - inputClass = mxDOUBLE_CLASS; - elementSize = sizeof(double); - break; - case MLfloatType: - inputClass = mxSINGLE_CLASS; - elementSize = sizeof(real32_T); - break; - case MLint8Type: - inputClass = mxINT8_CLASS; - elementSize = sizeof(int8_T); - break; - case MLuint8Type: - inputClass = mxUINT8_CLASS; - elementSize = sizeof(uint8_T); - break; - case MLint16Type: - inputClass = mxINT16_CLASS; - elementSize = sizeof(int16_T); - break; - case MLuint16Type: - inputClass = mxUINT16_CLASS; - elementSize = sizeof(uint16_T); - break; - case MLint32Type: - inputClass = mxINT32_CLASS; - elementSize = sizeof(int32_T); - break; - case MLuint32Type: - inputClass = mxUINT32_CLASS; - elementSize = sizeof(uint32_T); - break; - case MLint64Type: - inputClass = mxINT64_CLASS; - elementSize = sizeof(int64_T); - break; + case MLdoubleType: inputClass = mxDOUBLE_CLASS; elementSize = sizeof(double); break; + case MLfloatType: inputClass = mxSINGLE_CLASS; elementSize = sizeof(float); break; + case MLint8Type: inputClass = mxINT8_CLASS; elementSize = sizeof(int8_T); break; + case MLuint8Type: inputClass = mxUINT8_CLASS; elementSize = sizeof(uint8_T); break; + case MLint16Type: inputClass = mxINT16_CLASS; elementSize = sizeof(int16_T); break; + case MLuint16Type: inputClass = mxUINT16_CLASS; elementSize = sizeof(uint16_T); break; + case MLint32Type: inputClass = mxINT32_CLASS; elementSize = sizeof(int32_T); break; + case MLuint32Type: inputClass = mxUINT32_CLASS; elementSize = sizeof(uint32_T); break; + case MLint64Type: inputClass = mxINT64_CLASS; elementSize = sizeof(int64_T); break; default: inputClass = mxDOUBLE_CLASS; elementSize = sizeof(double); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-24 17:02:26
|
Revision: 202 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=202&view=rev Author: awakeideas Date: 2009-08-24 17:02:16 +0000 (Mon, 24 Aug 2009) Log Message: ----------- simplification Modified Paths: -------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h 2009-08-24 16:53:33 UTC (rev 201) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h 2009-08-24 17:02:16 UTC (rev 202) @@ -8,13 +8,9 @@ #import <ScriptingBridge/ScriptingBridge.h> -// Generated with: sdef /Applications/MeVisLab.app | sdp -fh --basename MeVisLab -#import "MeVisLab.h" - @interface MeVisLabScriptingBridge : NSObject { - MeVisLabApplication *MeVisLab; } -- (BOOL)openNetworkFile:(NSString *)filename; -- (BOOL)closeNetwork:(NSString *)filename; +- (BOOL)openNetworkWithFilename:(NSString *)filename; +- (BOOL)closeNetworkWithFilename:(NSString *)filename; @end Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m 2009-08-24 16:53:33 UTC (rev 201) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m 2009-08-24 17:02:16 UTC (rev 202) @@ -8,26 +8,18 @@ #import "MeVisLabScriptingBridge.h" +// Generated with: sdef /Applications/MeVisLab.app | sdp -fh --basename MeVisLab +#import "MeVisLab.h" -@implementation MeVisLabScriptingBridge +#define MEVISLAB_BUNDLEID @"de.mevis.MeVisLab" -- (id)init -{ - if ((self = [super init])) { - MeVisLab = [SBApplication applicationWithBundleIdentifier:@"de.mevis.MeVisLab"]; - } - return self; -} -- (void)dealloc -{ - [MeVisLab release]; - - [super dealloc]; -} +@implementation MeVisLabScriptingBridge -- (BOOL)openNetworkFile:(NSString *)filename +- (BOOL)openNetworkWithFilename:(NSString *)filename { + MeVisLabApplication *MeVisLab = [SBApplication applicationWithBundleIdentifier:MEVISLAB_BUNDLEID]; + if ([MeVisLab isRunning]) { [MeVisLab open:[NSArray arrayWithObject:filename]]; @@ -36,8 +28,10 @@ return NO; } -- (BOOL)closeNetwork:(NSString *)filename +- (BOOL)closeNetworkWithFilename:(NSString *)filename { + MeVisLabApplication *MeVisLab = [SBApplication applicationWithBundleIdentifier:MEVISLAB_BUNDLEID]; + if ([MeVisLab isRunning]) { NSArray *docs = [[MeVisLab documents] filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"path == %@", filename]]; if ([docs count] > 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-24 16:53:57
|
Revision: 201 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=201&view=rev Author: awakeideas Date: 2009-08-24 16:53:33 +0000 (Mon, 24 Aug 2009) Log Message: ----------- Added MeVisLab Scripting Bridge to open and close MeVisLab networks Modified Paths: -------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj Added Paths: ----------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLab.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLab.h =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLab.h (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLab.h 2009-08-24 16:53:33 UTC (rev 201) @@ -0,0 +1,56 @@ +/* + * MeVisLab.h + */ + +#import <AppKit/AppKit.h> +#import <ScriptingBridge/ScriptingBridge.h> + + +@class MeVisLabApplication, MeVisLabDocument, MeVisLabApplication; + + + +/* + * Standard Suite + */ + +// The application's top-level scripting object. +@interface MeVisLabApplication : SBApplication + +- (SBElementArray *) documents; + +@property (copy, readonly) NSString *name; // The name of the application. +@property (copy, readonly) NSString *version; // The version number of the application. + +- (void) open:(NSArray *)x; // Open a document. +- (void) quit; // Quit the application. +- (BOOL) exists:(id)x; // Verify that an object exists. +- (id) runMacro:(NSString *)x withParameters:(id)withParameters withParameter:(id)withParameter; // Run a macro module by calling the scripting function assigned to the consoleCommand tag in the Commands section of the module declaration. + +@end + +// A network document. +@interface MeVisLabDocument : SBObject + +@property (copy, readonly) NSString *name; // The document's name. +@property (copy, readonly) NSString *path; // The document's path. + +- (void) close; // Close a document. + +@end + + + +/* + * MeVisLab Suite + */ + +// The application's top-level scripting object. +@interface MeVisLabApplication (MeVisLabSuite) + +- (SBElementArray *) documents; + +@property (copy, readonly) NSArray *licenseFeatures; // The license features of the application. + +@end + Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLab.h ___________________________________________________________________ Added: svn:keywords + Author Added: svn:eol-style + native Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj 2009-08-20 12:45:23 UTC (rev 200) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj 2009-08-24 16:53:33 UTC (rev 201) @@ -19,6 +19,9 @@ 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 */; }; 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 */; }; @@ -78,6 +81,9 @@ 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>"; }; 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>"; }; @@ -198,6 +204,7 @@ AB2C26750677B0C400A08910 /* MeVisLabHub */ = { isa = PBXGroup; children = ( + B7350C161042F78000705C92 /* Scripting Bridge */, ABA48A640680BB600089EB4F /* MeVisLabHub.h */, ABA48A660680BB690089EB4F /* MeVisLabHub.m */, B9FB8AB9101E073A00C7C47C /* MeVisHubWindowController.h */, @@ -229,6 +236,16 @@ path = "OsiriX Headers"; sourceTree = "<group>"; }; + B7350C161042F78000705C92 /* Scripting Bridge */ = { + isa = PBXGroup; + children = ( + B7350C141042F77700705C92 /* MeVisLab.h */, + B7350C071042F3F900705C92 /* MeVisLabScriptingBridge.h */, + B7350C081042F3F900705C92 /* MeVisLabScriptingBridge.m */, + ); + name = "Scripting Bridge"; + sourceTree = "<group>"; + }; B914608B103359E3005BDFCF /* ICON */ = { isa = PBXGroup; children = ( @@ -280,6 +297,8 @@ B9B53728102B818F00559FEB /* OsiriX2MeVisLabTBridge.h in Headers */, B9912200102DB75A007BB4B6 /* DCMView.h in Headers */, B91469BA10338AFE005BDFCF /* CMIVDCMView.h in Headers */, + B7350C091042F3F900705C92 /* MeVisLabScriptingBridge.h in Headers */, + B7350C151042F77700705C92 /* MeVisLab.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -372,6 +391,7 @@ B933E994102B09A100FD33FF /* SharedImagesManager.mm in Sources */, B9B5371E102B818700559FEB /* OsiriX2MeVisLabTBridge.mm in Sources */, B91469BB10338AFE005BDFCF /* CMIVDCMView.m in Sources */, + B7350C0A1042F3F900705C92 /* MeVisLabScriptingBridge.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h 2009-08-24 16:53:33 UTC (rev 201) @@ -0,0 +1,20 @@ +// +// MeVisLabScriptingBridge.h +// MeVisLabHub +// +// Created by Felix Ritter on 24.08.09. +// Copyright 2009 Fraunhofer MEVIS - Institute for Medical Image Computing. All rights reserved. +// + +#import <ScriptingBridge/ScriptingBridge.h> + +// Generated with: sdef /Applications/MeVisLab.app | sdp -fh --basename MeVisLab +#import "MeVisLab.h" + + +@interface MeVisLabScriptingBridge : NSObject { + MeVisLabApplication *MeVisLab; +} +- (BOOL)openNetworkFile:(NSString *)filename; +- (BOOL)closeNetwork:(NSString *)filename; +@end Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.h ___________________________________________________________________ Added: svn:keywords + Author Added: svn:eol-style + native Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m 2009-08-24 16:53:33 UTC (rev 201) @@ -0,0 +1,53 @@ +// +// MeVisLabScriptingBridge.m +// MeVisLabHub +// +// Created by Felix Ritter on 24.08.09. +// Copyright 2009 Fraunhofer MEVIS - Institute for Medical Image Computing. All rights reserved. +// + +#import "MeVisLabScriptingBridge.h" + + +@implementation MeVisLabScriptingBridge + +- (id)init +{ + if ((self = [super init])) { + MeVisLab = [SBApplication applicationWithBundleIdentifier:@"de.mevis.MeVisLab"]; + } + return self; +} + +- (void)dealloc +{ + [MeVisLab release]; + + [super dealloc]; +} + +- (BOOL)openNetworkFile:(NSString *)filename +{ + if ([MeVisLab isRunning]) { + [MeVisLab open:[NSArray arrayWithObject:filename]]; + + return YES; + } + return NO; +} + +- (BOOL)closeNetwork:(NSString *)filename +{ + if ([MeVisLab isRunning]) { + NSArray *docs = [[MeVisLab documents] filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"path == %@", filename]]; + if ([docs count] > 0) { + MeVisLabDocument *doc = [docs objectAtIndex:0]; + [doc close]; + + return YES; + } + } + return NO; +} + +@end Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabScriptingBridge.m ___________________________________________________________________ Added: svn:keywords + Author Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <coe...@us...> - 2009-08-20 12:45:34
|
Revision: 200 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=200&view=rev Author: coertmetz Date: 2009-08-20 12:45:23 +0000 (Thu, 20 Aug 2009) Log Message: ----------- CM: -BUG: Solved a bug which caused the centerline not to be outputted as XMarkerList when the Graph classes are not available. -ENH: Now the vesselnumber is outputted as the type of the markers to make separation of the centerlines easy. Modified Paths: -------------- trunk/Community/General/Modules/ML/MLLoadCAT08Data/html/LoadCAT08Data.html trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp Modified: trunk/Community/General/Modules/ML/MLLoadCAT08Data/html/LoadCAT08Data.html =================================================================== --- trunk/Community/General/Modules/ML/MLLoadCAT08Data/html/LoadCAT08Data.html 2009-08-17 18:30:17 UTC (rev 199) +++ trunk/Community/General/Modules/ML/MLLoadCAT08Data/html/LoadCAT08Data.html 2009-08-20 12:45:23 UTC (rev 200) @@ -118,7 +118,7 @@ Points S<br> Points E<br> <br> -An XMarkerList with all center line points.<br> +An XMarkerList with all center line points (the type of the XMarkers is set to the vessel number).<br> An ML Graph structure which can be visualized with the <span style="font-weight: bold;">SoVascularSystem</span> module.<br> </blockquote> Modified: trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp =================================================================== --- trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp 2009-08-17 18:30:17 UTC (rev 199) +++ trunk/Community/General/Sources/ML/MLLoadCAT08Data/mlLoadCAT08Data.cpp 2009-08-20 12:45:23 UTC (rev 200) @@ -181,25 +181,30 @@ dataFileName.str(""); // This is a strange way to clear the dataFileName, but dataFileName.clear() does not work file_to_read.close(); - #if ML_GRAPH_IS_AVAILABLE - // Get vessel centerline as XMarkers and Vessel Graph - dataFileName << pathname << "vessel" << vesselNbr << "/" << "reference.txt"; - file_to_read.open(dataFileName.str().c_str()); - if(file_to_read) { - int pointNbr = 0; + // Get vessel centerline as XMarkers and Vessel Graph + dataFileName << pathname << "vessel" << vesselNbr << "/" << "reference.txt"; + file_to_read.open(dataFileName.str().c_str()); + if(file_to_read) { + int pointNbr = 0; + #if ML_GRAPH_IS_AVAILABLE // Create a new vessel graph edge VesselEdge *graphEdge = new VesselEdge; VesselNode *rootNode = NULL; - do { + #endif + do { + // Extract point and radius + double x,y,z,r,foo; + file_to_read >> x >> y >> z >> r >> foo; + vec3 pos(x,y,z); - // Extract point and radius - double x,y,z,r,foo; - file_to_read >> x >> y >> z >> r >> foo; - vec3 pos(x,y,z); + // Create a marker and set its type to the vessel number + XMarker marker (vec6(pos,0,0,0), vec3(0)); + marker.type = vesselNbr; - // Add to XMarker list - _centerLineList.appendItem(XMarker(vec6(pos,0,0,0), vec3(0))); + // Add to XMarker list + _centerLineList.appendItem(marker); + #if ML_GRAPH_IS_AVAILABLE // If this is the first point, add new root to the Vessel Graph if(0 == pointNbr) { rootNode = new VesselNode(pos); // Create new node @@ -209,11 +214,13 @@ } // Create a skeleton and add it to the edge graphEdge->addSkeleton(Skeleton(pos, r, r)); + #endif - // Increment - ++pointNbr; - }while(!file_to_read.eof()); + // Increment + ++pointNbr; + }while(!file_to_read.eof()); + #if ML_GRAPH_IS_AVAILABLE // Finish generating the vessel graph by adding the edge and end node to the graph VesselNode *endNode = new VesselNode(graphEdge->backSkeleton()->pos); _outputGraph.addNode(endNode); @@ -222,8 +229,9 @@ graphEdge->setSucc(endNode); // Add the vessel edge to the graph _outputGraph.attachIdEdge(graphEdge,rootNode->getId(),endNode->getId()); - } - #endif + #endif + } + dataFileName.str(""); // This is a strange way to clear the dataFileName, but dataFileName.clear() does not work file_to_read.close(); file_to_read.clear(); // Another strange thing, clear() must be called when we read the file to eof, otherwise we cannot reopen file_to_read later. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 18:30:23
|
Revision: 199 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=199&view=rev Author: awakeideas Date: 2009-08-17 18:30:17 +0000 (Mon, 17 Aug 2009) Log Message: ----------- added header files Modified Paths: -------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro 2009-08-17 13:40:39 UTC (rev 198) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro 2009-08-17 18:30:17 UTC (rev 199) @@ -28,17 +28,20 @@ DEFINES += MLOSIRIXIMPORTER_EXPORTS HEADERS += \ + MeVisOsiriXProxyProtocol.h \ + MeVisLab2OsiriXTBridge.h \ + SharedImagesManager.h \ MLOsiriXImporterInit.h \ MLOsiriXImporterSystem.h \ mlOsiriXImporter.h \ mlOsiriXExporter.h OBJECTIVE_SOURCES += \ + MeVisLab2OsiriXTBridge.mm \ + SharedImagesManager.mm \ MLOsiriXImporterInit.mm \ mlOsiriXImporter.mm \ - mlOsiriXExporter.mm \ - MeVisLab2OsiriXTBridge.mm \ - SharedImagesManager.mm + mlOsiriXExporter.mm # additional files that are NOT compiled RELATEDFILES += \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 13:40:49
|
Revision: 198 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=198&view=rev Author: awakeideas Date: 2009-08-17 13:40:39 +0000 (Mon, 17 Aug 2009) Log Message: ----------- removed wrong Copyright header Modified Paths: -------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat 2009-08-17 13:01:49 UTC (rev 197) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat 2009-08-17 13:40:39 UTC (rev 198) @@ -1,3 +1 @@ "%MLAB_ROOT%\MeVis\Foundation\BuildTools\Scripts\createProject.bat" MLOsiriXImporter - - Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh 2009-08-17 13:01:49 UTC (rev 197) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh 2009-08-17 13:40:39 UTC (rev 198) @@ -1,35 +1,6 @@ #! /bin/bash -#----------------------------------------------------------------------------- -# ----------------------------------------------------------------------- -# -# Copyright (c) 2001-2009, MeVis Medical Solutions AG, Bremen, Germany -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of MeVis Medical Solutions AG nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY MEVIS MEDICAL SOLUTIONS AG ''AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL MEVIS MEDICAL SOLUTIONS AG BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#----------------------------------------------------------------------------- if [ "`uname -s`" = "Darwin" && "$MLAB_ROOT" = "" ]; then echo "Generate Xcode projects by double-clicking the file 'MLOsiriXImporter.pro' in Finder or use the MeVisLabProjectGenerator.app from the command line to customize the project creation." else python $MLAB_ROOT/MeVis/Foundation/BuildTools/Scripts/createProject.py MLOsiriXImporter fi - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 13:22:21
|
Revision: 196 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=196&view=rev Author: awakeideas Date: 2009-08-17 13:00:23 +0000 (Mon, 17 Aug 2009) Log Message: ----------- removed PlugIns folder Removed Paths: ------------- trunk/Community/General/bin/PlugIns/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 13:01:58
|
Revision: 197 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=197&view=rev Author: awakeideas Date: 2009-08-17 13:01:49 +0000 (Mon, 17 Aug 2009) Log Message: ----------- - added 'Copy PlugIn to bin' build phase to Xcode project - only build for intel architectures Modified Paths: -------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj 2009-08-17 13:00:23 UTC (rev 196) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj 2009-08-17 13:01:49 UTC (rev 197) @@ -18,6 +18,7 @@ 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 */; }; 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 */; }; @@ -48,6 +49,19 @@ B9FB8ABC101E073A00C7C47C /* MeVisHubWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9FB8ABA101E073A00C7C47C /* MeVisHubWindowController.m */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + B70FD4F2103989E10094B238 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ../../../../../../bin/PlugIns; + dstSubfolderSpec = 16; + files = ( + B70FD53410398B300094B238 /* MeVisLabHub.osirixplugin in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; @@ -281,6 +295,7 @@ 8D5B49B1048680CD000E48DA /* Sources */, 8D5B49B3048680CD000E48DA /* Frameworks */, 8D5B49B5048680CD000E48DA /* Rez */, + B70FD4F2103989E10094B238 /* CopyFiles */, ); buildRules = ( ); @@ -377,6 +392,10 @@ CE6A9A9108AC841300D0C1EE /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + i386, + x86_64, + ); COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; FRAMEWORK_SEARCH_PATHS = ""; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 12:59:15
|
Revision: 195 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=195&view=rev Author: awakeideas Date: 2009-08-17 12:59:06 +0000 (Mon, 17 Aug 2009) Log Message: ----------- added PlugIns folder Added Paths: ----------- trunk/Community/General/bin/PlugIns/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 12:32:09
|
Revision: 194 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=194&view=rev Author: awakeideas Date: 2009-08-17 12:31:57 +0000 (Mon, 17 Aug 2009) Log Message: ----------- Adapting subversion properties, e.g. eol-style Property Changed: ---------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.h trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterSystem.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLab2OsiriXTBridge.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLab2OsiriXTBridge.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/ConfigCoreDataDelegate.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/ConfigCoreDataDelegate.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/English.lproj/locversion.plist trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Info.plist trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubGUI.xib trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisOsiriXProxyProtocol.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/DCMPix.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/DCMView.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/MyPoint.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/OSIWindowController.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/PluginFilter.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/ROI.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/Schedulable.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/Scheduler.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/StaticScheduler.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/ViewerController.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/dicomFile.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge2222.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge2222.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/PlugProxyForMeVisLab.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/PlugProxyForMeVisLab.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/SharedImagesManager.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/SharedImagesManager.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/logo.jpg trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/version.plist trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisOsiriXProxyProtocol.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MevisProxyForOsiriX.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MevisProxyForOsiriX.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/SharedImagesManager.h trunk/Community/General/Sources/ML/MLOsiriXImporter/SharedImagesManager.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXExporter.h trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXExporter.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXImporter.h trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXImporter.mm Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterSystem.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLab2OsiriXTBridge.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLab2OsiriXTBridge.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.m ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/ConfigCoreDataDelegate.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/ConfigCoreDataDelegate.m ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/English.lproj/locversion.plist ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Info.plist ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubGUI.xib ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.m ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.m ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisOsiriXProxyProtocol.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/DCMPix.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/DCMView.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/MyPoint.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/OSIWindowController.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/PluginFilter.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/ROI.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/Schedulable.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/Scheduler.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/StaticScheduler.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/ViewerController.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/dicomFile.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge2222.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge2222.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/PlugProxyForMeVisLab.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/PlugProxyForMeVisLab.m ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/SharedImagesManager.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/SharedImagesManager.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/logo.jpg ___________________________________________________________________ Modified: svn:mime-type - application/octet-stream + image/jpeg Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/version.plist ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisOsiriXProxyProtocol.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MevisProxyForOsiriX.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MevisProxyForOsiriX.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/SharedImagesManager.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/SharedImagesManager.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXExporter.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXExporter.mm ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXImporter.h ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXImporter.mm ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-08-17 12:07:02
|
Revision: 193 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=193&view=rev Author: wolfspindler Date: 2009-08-17 12:06:54 +0000 (Mon, 17 Aug 2009) Log Message: ----------- NEW: -Forgotten script file of new multi purpose loader LoadAny added. Added Paths: ----------- trunk/Community/General/Modules/Macros/LoadAny/LoadAny.script Added: trunk/Community/General/Modules/Macros/LoadAny/LoadAny.script =================================================================== --- trunk/Community/General/Modules/Macros/LoadAny/LoadAny.script (rev 0) +++ trunk/Community/General/Modules/Macros/LoadAny/LoadAny.script 2009-08-17 12:06:54 UTC (rev 193) @@ -0,0 +1,238 @@ +// **InsertLicense** code +//---------------------------------------------------------------------------------- +//! Script of the LoadAny module +/*! +// \file LoadAny.script +// \author Wolf Spindler +// \date 08/09 +*/ +//---------------------------------------------------------------------------------- + +Interface { + Inputs = "" + Outputs { + Field outImage { + internalName = Bypass.output0 + } + Field outBase { + internalName = BaseBypassOp.outBaseField + } + Field outInventor { + internalName = SoSwitch.self + } + } + Parameters { + Field name { type = string value = "" } + Field trueName { type = string value = "" } + Field clearConsole { type = trigger } + Field load { type = trigger } + Field tryTypicalLoaders { type = trigger } + Field tryAllLoaders { type = trigger } + Field verbose { type = bool value = false } + Field analyzeHeader { type = bool value = true } + Field allowBioFormats { type = bool value = false } + Field close { type = trigger } + //Field prefLoader { type = string value = "" } + Field textOut { type = string value = "" } + Field loaderName { type = string value = "" } + Field writerNames { type = string value = "" } + Field formatInfo { type = string value = "" } + Field shortFileHeader { type = string value = "" } + Field fileHeader { type = string value = "" } + Field status { type = string value = "" } + } +} + +Commands { + source = "$(LOCAL)/LoadAny.js" + source = "$(LOCAL)/LoadAny.py" + droppedFileCommand = fileDropped + initCommand = init + finalizeCommand = clear + FieldListener { + listenField = name + listenField = load + listenField = analyzeHeader + listenField = allowBioFormats + command = "*js: nameChanged(false, false); *" + } + FieldListener trueName { command = updateFileHeaderPy } +} + + +Window { + initCommand = wakeUpInit + ExpandY = Yes + Vertical { + expandX = Yes + ExpandY = Yes + TabView { + ExpandX = Yes + ExpandY = Yes + TabViewItem Main { + ExpandX = Yes + ExpandY = Yes + Vertical { + ExpandX = Yes + ExpandY = No + droppedFileCommand = fileDropped + margin = 8 + Vertical { + expandY = No + Horizontal { + expandY = No + Field name { + tooltip = "The file name to be loaded, perhaps with variables which still have to be resolved" + } + Button { + tooltip = "Press to open a file selection dialog" + title = "Browse..." + command = fileDialog + } + } + + Field trueName { + tooltip = "The internally used path to the loaded file" + alignGroup = group1 + edit = NO + trim = left + } + + Box Examples { + ExpandY = No + HyperLabel { + ExpandY = No + title = "<table> + <tr><td><nobr>$<b>(NETWORK)</b>/test.tif</nobr> <td><nobr>for images relative to this network</nobr> + <tr><td><nobr>$<b>(HOME)</b>/images/test.tif</nobr> <td><nobr>for images in users home directory</nobr> + <tr><td><nobr>$<b>(DemoDataPath)</b>/test.tif</nobr> <td><nobr>for images local to variable in mevislab.prefs</nobr></table> + " + } + } // Box Examples + + //Splitter { + // Direction = Vertical + // Vertical { + // ExpandY = Yes + // Label { title = "Preferred Loader:" } + // ListView prefLoader { + // tooltip = "Short compactified description of the used loader" + // expandY = Yes + // style = fixed + // rowSeparator = \n + // visibleRows = 4 + // Header = Yes + // //selectionChangedCommand = "*js: ctx.field("updateModuleList").setStringValue(""); *" + // //clickedCommand = "*js: ctx.field("updateModuleList").setStringValue(""); *" + // } + // } + //} + } + Horizontal { + CheckBox analyzeHeader{ + title = "Use Header Analysis" + tooltip = "Enables a heuristic to identify file formats correctly, e.g. if no or only a number is available as file extensions" + } + CheckBox verbose { + tooltip = "Much more information is listed in the console if this checkbox is enabled" + } + CheckBox allowBioFormats { + title = "Allow BioFormatsLoad" + tooltip = "If this flag is on and the module exists then the BioFormatsLoad module is also used for data loading" + } + } + } + + + Field loaderName { + title = "Loader:" + tooltip = "Module used to open the file" + edit = No + } + Field writerNames { + title = "Writers:" + tooltip = "Module(s) which could be used to save the file" + edit = No + } + Field formatInfo { + tooltip = "Shows information about the format of the opened file" + edit = No + } + Field shortFileHeader { + title = "Short Header:" + tooltip = "First 48 (or less if null-chars are found) characters from the file." + edit = No + } + TextView status { + tooltip = "Shows general information, notes, errors etc. about the load process" + edit = No + console = Yes + visibleRows = 5 + expandY = Yes + } + + Horizontal { + Button clearConsole { + AlignX = Left + title = "Clear Console" + tooltip = "Clears the current status output" + command = "*js: ctx.field("status").value = ""; *" + } + Horizontal { + AlignX = Right + Button load { + title = "Load" + tooltip = "Load, reload or retry to load the specified file" + } + Button tryTypicalLoaders { + title = "Try Typical Loaders" + tooltip = "Try to open the file with the most common loaders while passing - but not analyzing - the file extension. +Warning: This option is can be time consuming and instable because the file will be inappropriate for most loaders." + command = "*js: nameChanged(true, false); *" + } + Button tryAllLoaders { + title = "Try All Loaders" + tooltip = "Try to open the file with all loaders while passing - but not analyzing - the file extension. +Warning: This option is can be time consuming and instable because the file will be inappropriate for most loaders." + command = "*js: nameChanged(false, true); *" + } + Button close { + tooltip = "Closes a currently open file" + command = "*js: clear(); logConsole("File closed.", false, false); *" + } + } + } + + + } // TabViewItem Main + + TabViewItem "Header Info" { + expandY = Yes + Vertical { + expandY = Yes + TextView fileHeader { + tooltip = "First 1K characters of the file." + edit = No + expandY = Yes + } + } + } + + TabViewItem "Text Output" { + ExpandX = Yes + ExpandY = Yes + Vertical { + ExpandX = Yes + ExpandY = Yes + TextView textOut { + tooltip = "Output field for loaders which do not load files but single information such as strings" + edit = No + ExpandY = Yes + } + } + } + + } // TabView + } // Vertical + +} // Window Property changes on: trunk/Community/General/Modules/Macros/LoadAny/LoadAny.script ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 11:51:51
|
Revision: 192 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=192&view=rev Author: awakeideas Date: 2009-08-17 11:51:36 +0000 (Mon, 17 Aug 2009) Log Message: ----------- ignore Mac OS X only projects on windows + linux 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 2009-08-17 11:44:47 UTC (rev 191) +++ trunk/Community/General/Configuration/MasterBuilder/MLAB_Community_General/ignoredProFiles.txt 2009-08-17 11:51:36 UTC (rev 192) @@ -25,3 +25,6 @@ #Sources/ML/MLImageUtilities/* #Sources/ML/MLTestModules/* + +# Mac OS X only projects +Sources/ML/MLOsiriXImporter/* windows,linux This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 11:44:56
|
Revision: 191 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=191&view=rev Author: awakeideas Date: 2009-08-17 11:44:47 +0000 (Mon, 17 Aug 2009) Log Message: ----------- added .pro file for automated builds Added Paths: ----------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.pro Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.pro =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.pro (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.pro 2009-08-17 11:44:47 UTC (rev 191) @@ -0,0 +1,10 @@ +# MeVisLabHub + +macx { + + # build the plugin using xcodebuild + release:!debug:system(xcodebuild -configuration Development clean build) + + # the plugin will end up in 'build/Development' (MeVisLabHub.osirixplugin) + +} Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.pro ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <awa...@us...> - 2009-08-17 10:22:11
|
Revision: 190 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=190&view=rev Author: awakeideas Date: 2009-08-17 10:22:00 +0000 (Mon, 17 Aug 2009) Log Message: ----------- - adapted .pro file to contain all bits required to generate Xcode project from .pro file - removed .xcodeproj, they as it can now be generated - ignore *.xcodeproj for subversion Modified Paths: -------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro Removed Paths: ------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter_debug.xcodeproj/ Property Changed: ---------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/ Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter ___________________________________________________________________ Added: svn:ignore + *.xcodeproj Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro 2009-08-17 09:55:23 UTC (rev 189) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro 2009-08-17 10:22:00 UTC (rev 190) @@ -17,7 +17,7 @@ WARN = HIGH # add used projects here (see included pri files below for available projects) -CONFIG += dll ML +CONFIG += dll ML MLBase MLAB_PACKAGES += Community_General \ MeVisLab_Standard @@ -33,12 +33,17 @@ mlOsiriXImporter.h \ mlOsiriXExporter.h -SOURCES += \ +OBJECTIVE_SOURCES += \ MLOsiriXImporterInit.mm \ mlOsiriXImporter.mm \ - mlOsiriXExporter.mm + mlOsiriXExporter.mm \ + MeVisLab2OsiriXTBridge.mm \ + SharedImagesManager.mm # additional files that are NOT compiled RELATEDFILES += \ ../../../Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def +LIBS += \ + -framework Foundation \ + -framework AppKit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wol...@us...> - 2009-08-17 09:55:32
|
Revision: 189 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=189&view=rev Author: wolfspindler Date: 2009-08-17 09:55:23 +0000 (Mon, 17 Aug 2009) Log Message: ----------- NEW: -New multi purpose loader LoadAny added. Added Paths: ----------- trunk/Community/General/Modules/Macros/LoadAny/ trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def trunk/Community/General/Modules/Macros/LoadAny/LoadAny.js trunk/Community/General/Modules/Macros/LoadAny/LoadAny.mlab trunk/Community/General/Modules/Macros/LoadAny/LoadAny.py Added: trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def =================================================================== --- trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def (rev 0) +++ trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def 2009-08-17 09:55:23 UTC (rev 189) @@ -0,0 +1,21 @@ +// **InsertLicense** code +//---------------------------------------------------------------------------------- +//! Definition file for LoadAny module +/*! +// \file LoadAny.def +// \author Wolf Spindler +// \date 08/09 +*/ +//---------------------------------------------------------------------------------- + +MacroModule LoadAny { + genre = File + externalDefinition = $(LOCAL)/LoadAny.script + author = "Wolf Spindler" + comment = "Module to identify, analyze, open and perhaps load most MeVisLab, ML, WEM, CSO itk, vtk and many other file formats" + keywords = "any arbitray multiple file formats image reader loader automatic analyze analysis detection importer" + seeAlso = "LocalSoFile LocalImage ImageLoad ImageSave itkImageFileReader SoFile LoadBase CSOLoad MLImageFormatLoad MLImageFormatFileCache" + status = stable + documentation = $(LOCAL)/html/LoadAny.html + examplenetwork = $(LOCAL)/networks/LoadAny.mlab +} Property changes on: trunk/Community/General/Modules/Macros/LoadAny/LoadAny.def ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/Community/General/Modules/Macros/LoadAny/LoadAny.js =================================================================== --- trunk/Community/General/Modules/Macros/LoadAny/LoadAny.js (rev 0) +++ trunk/Community/General/Modules/Macros/LoadAny/LoadAny.js 2009-08-17 09:55:23 UTC (rev 189) @@ -0,0 +1,1311 @@ +// **InsertLicense** code +//---------------------------------------------------------------------------------- +//! Java Script functionality for the LoadAny module +/*! +// \file LoadAny.py +// \author Wolf Spindler +// \date 08/09 +*/ +//---------------------------------------------------------------------------------- + +var loaderModName; +var fileLoader ; + +SuffixList = [ + // File ending | Loader Module | Name of Outfield | File namefield | Format/Loader Description | Automatic? | | Field to touch/set| Check | CheckVal + [".tiff" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad for the Tagged Image File Format" , "Yes", "ImageSave", "" , "" , "" ], + [".tif" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad for the Tagged Image File Format" , "Yes", "ImageSave", "" , "" , "" ], + [".dcm" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave", "" , "" , "" ], + [".raw" , "ImageLoad" , "output0" , "filename" , "Try to load with ImageLoad module manually" , "No", "ImageSave", "" , "" , "" ], + [".pgm" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad for Portable Grey Map" , "Yes", "ImageSave vtkPNMWriter", "" , "" , "" ], + [".pnm" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave vtkPNMWriter", "" , "" , "" ], + [".ppm" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave vtkPNMWriter", "" , "" , "" ], + [".png" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave vtkPNGWriter", "" , "" , "" ], + [".bmp" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave vtkBMPWriter", "" , "" , "" ], + [".dicom" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave", "" , "" , "" ], + [".jpe" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave vtkJPEGWriter", "" , "" , "" ], + [".jpg" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave vtkJPEGWriter", "" , "" , "" ], + [".jpeg" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave", "" , "" , "" ], + [".analyze" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave", "" , "" , "" ], + [".quoc" , "ImageLoad" , "output0" , "filename" , "MeVisLab ImageLoad" , "Yes", "ImageSave", "" , "" , "" ], + + // Additional file formats supported by ImageLoad on Mac. + [".3fr" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .3fr files" , "Yes", "", "" , "" , "" ], + [".arw" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .arw Sony RAW Image files" , "Yes", "", "" , "" , "" ], + [".ai" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Adobe Illustrator Vector Graphics" , "Yes", "", "" , "" , "" ], + [".cr2" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Canon Digital Camera Raw images" , "Yes", "", "" , "" , "" ], + [".crw" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Canon Digital Camera Raw images" , "Yes", "", "" , "" , "" ], + [".dcr" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Kodak Digital Camera Raw images" , "Yes", "", "" , "" , "" ], + [".dng" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Digital Negative Format images" , "Yes", "", "" , "" , "" ], + [".exr" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for OpenEXR Bitmaps" , "Yes", "", "" , "" , "" ], + [".fff" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .fff files" , "Yes", "", "" , "" , "" ], + [".fpx" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .fpx FlashPix Bitmaps" , "Yes", "", "" , "" , "" ], + [".gif" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Graphic Interchange Format images" , "Yes", "", "" , "" , "" ], + [".hdr" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .hdr files" , "Yes", "", "" , "" , "" ], + [".icns" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .hdr files" , "Yes", "", "" , "" , "" ], + [".ico" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Windows .ico icon files" , "Yes", "", "" , "" , "" ], + [".j2k" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for JPEG-2000 images" , "Yes", "", "" , "" , "" ], + [".jp2" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for JPEG-2000 images" , "Yes", "", "" , "" , "" ], + [".jpe" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .jpe JPEG images" , "Yes", "ImageSave", "" , "" , "" ], + [".jpf" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .jpf files" , "Yes", "", "" , "" , "" ], + [".jpx" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for JPEG-2000 images" , "Yes", "", "" , "" , "" ], + [".mos" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .mos files" , "Yes", "", "" , "" , "" ], + [".mrw" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Sony (Minolta) Raw Image File" , "Yes", "", "" , "" , "" ], + [".nef" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .nef files" , "Yes", "", "" , "" , "" ], + [".orf" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Olympus Digital Camera Raw Images" , "Yes", "", "" , "" , "" ], + [".pct" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .pct files" , "Yes", "", "" , "" , "" ], + [".pdf" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Adobe Acrobat .pdf files" , "Yes", "", "" , "" , "" ], + [".pef" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Pentax RAW Bitmap Graphics" , "Yes", "", "" , "" , "" ], + [".pic" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .pic files" , "Yes", "", "" , "" , "" ], + [".pict" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Macintosh Quickdraw/PICT Drawings" , "Yes", "", "" , "" , "" ], + [".pntg" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for MacPaint Bitmap Graphics" , "Yes", "", "" , "" , "" ], + [".psd" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Photoshop files" , "Yes", "", "" , "" , "" ], + [".qif" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Quicktime images" , "Yes", "", "" , "" , "" ], + [".qti" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Quicktime images" , "Yes", "", "" , "" , "" ], + [".qtif" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Quicktime images" , "Yes", "", "" , "" , "" ], + [".raf" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Fuji CCD-RAW Graphic files" , "Yes", "", "" , "" , "" ], + [".sgi" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Silicon Graphics Images" , "Yes", "", "" , "" , "" ], + [".srf" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for .srf files" , "Yes", "", "" , "" , "" ], + [".tga" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for Truevision Targa Graphics" , "Yes", "", "" , "" , "" ], + [".xbm" , "ImageLoad" , "output0" , "filename" , "Mac ImageLoad extension for X Bitmaps" , "Yes", "", "" , "" , "" ], + ["*" , "ImageLoad" , "output0" , "filename" , "Try MeVisLab ImageLoad for files with no or unknown extension" , "Yes", "", "" , "" , "" ], + + [".base" , "LoadBase" , "outObject" , "filename" , "MeVisLab loader for Base Objects" , "Yes", "", "" , "" , "" ], + [".xml" , "LoadBase" , "outObject" , "filename" , "MeVisLab loader for Base Objects" , "Yes", "", "" , "" , "" ], + ["*" , "LoadBase" , "outObject" , "filename" , "Try MeVisLab Base loader for files with no or unknown extension" , "Yes", "", "" , "" , "" ], + + [".gvr" , "GVRVolumeLoad" , "outVolume" , "filename" , "MeVisLab Giga Voxel Renderer octtree files" , "Yes", "GVRVolumeSave", "" , "" , "" ], + [".mlimage" , "MLImageFormatLoad" , "output0" , "fileName" , "MeVisLab ML Image Format" , "Yes", "MLImageFormatSave", "" , "" , "" ], + [".mif" , "MLImageFormatLoad" , "output0" , "fileName" , "MeVisLab ML Image Format" , "Yes", "MLImageFormatSave", "" , "" , "" ], + + [".cso" , "CSOLoad" , "outCSOList" , "fileName" , "MeVisLab Contour Segmentation Object (CSO) File Format" , "Yes", "CSOSave", "" , "loadSuccess", "TRUE"], + [".pwn" , "PointCloudLoad" , "outPointCloud" , "fileName" , "MeVisLab Point Cloud (Points With normals) file format" , "Yes", "PointCloudSave", "load", "" , "" ], + + [".txt" , "LoadTreeData" , "outputGraph" , "filename" , "MeVisLab Tree Data Loader" , "Yes", "SaveTreeData", "load", "isValidOutputGraph", "TRUE"], + [".mltrdata" , "LoadTreeData" , "outputGraph" , "filename" , "MeVisLab Tree Data Loader" , "Yes", "SaveTreeData", "load", "isValidOutputGraph", "TRUE"], + + [".lfa" , "LoadLinFunc" , "outputArray" , "fileName" , "LinFunc Array" , "Yes", "SaveLinFunc", "load", "" , "" ], + [".lf" , "LoadLinFunc" , "outputArray" , "fileName" , "LinFunc" , "Yes", "SaveLinFunc", "singleFunction=TRUE", "" , "" ], + + // itkImageFileReader + [".analyze" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Analyze 7.5" , "Yes", "ImageSave", "" , "" , "" ], + [".hdr" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Analyze 7.5" , "Yes", "ImageSave", "" , "" , "" ], + [".img" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Analyze 7.5" , "Yes", "ImageSave", "" , "" , "" ], + [".bmp" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "BMP ? using itk BMPImageIO" , "Yes", "ImageSave vtkBMPWriter", "" , "" , "" ], + [".dcm" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "DICOM" , "Yes", "ImageSave", "" , "" , "" ], + [".gdcm" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "DICOM" , "Yes", "ImageSave", "" , "" , "" ], + [".dicom" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "DICOM" , "Yes", "ImageSave", "" , "" , "" ], + [".4x" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "GE 4x" , "Yes", "", "" , "" , "" ], + [".5x" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "GE 5x" , "Yes", "", "" , "" , "" ], + [".ge" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "GE Advantage Windows" , "Yes", "", "" , "" , "" ], + [".ge4x" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "GE Advantage Windows" , "Yes", "", "" , "" , "" ], + [".ge5x" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "GE Advantage Windows" , "Yes", "", "" , "" , "" ], + [".gipl" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Gipl (.gipl)" , "Yes", "", "" , "" , "" ], + [".ipl" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "IPLCommon" , "Yes", "", "" , "" , "" ], + [".jpg" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "JPEG ? using itk JPEGImageIO" , "Yes", "ImageSave vtkJPEGWriter", "" , "" , "" ], + [".jpeg" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "JPEG ? using itk JPEGImageIO" , "Yes", "ImageSave vtkJPEGWriter", "" , "" , "" ], + [".mha" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "MetaImage (.mha/.mhd)" , "Yes", "vtkMetaImageWriter", "" , "" , "" ], + [".mhd" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "MetaImage (.mha/.mhd)" , "Yes", "vtkMetaImageWriter", "" , "" , "" ], + [".png" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "PNG ? " , "Yes", "ImageSave vtkPNGWriter", "" , "" , "" ], + [".raw" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Raw ? " , "Yes", "ImageSave", "" , "" , "" ], + [".vision" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Siemens Vision" , "Yes", "", "" , "" , "" ], + [".siemens" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Siemens Vision" , "Yes", "", "" , "" , "" ], + [".spr" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Stimulate (spr/sdt)" , "Yes", "", "" , "" , "" ], + [".sdt" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Stimulate (spr/sdt)" , "Yes", "", "" , "" , "" ], + [".stimulate" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Stimulate (spr/sdt)" , "Yes", "", "" , "" , "" ], + [".tif" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Tagged Image File Format" , "Yes", "ImageSave", "" , "" , "" ], + [".tiff" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Tagged Image File Format" , "Yes", "ImageSave", "" , "" , "" ], + [".bio" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Bio-Rad confocal microscope (MRC)" , "Yes", "", "" , "" , "" ], + [".biorad" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Bio-Rad confocal microscope (MRC)" , "Yes", "", "" , "" , "" ], + [".brains" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Brains2Mask file format" , "Yes", "", "" , "" , "" ], + [".brains2" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Brains2Mask file format" , "Yes", "", "" , "" , "" ], + [".brains2mask" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Brains2Mask file format" , "Yes", "", "" , "" , "" ], + [".bruker" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Bruker2DSEQ" , "Yes", "", "" , "" , "" ], + [".bruker2d" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Bruker2DSEQ" , "Yes", "", "" , "" , "" ], + [".bruker2dseq" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Bruker2DSEQ" , "Yes", "", "" , "" , "" ], + + // Hmm, MINC obviously cannot be read although I believed so. + //[".mnc" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "MINC2 file format" , "Yes", "vtkMINCImageWriter", "" , "" , "" ], + //[".mnc2" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "MINC2 file format" , "Yes", "vtkMINCImageWriter", "" , "" , "" ], + [".minc" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "MINC2 file format" , "Yes", "vtkMINCImageWriter", "" , "" , "" ], + [".minc2" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "MINC2 file format" , "Yes", "vtkMINCImageWriter", "" , "" , "" ], + [".nii" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Neuroimaging Informatics Technology Initiative files" , "Yes", "", "" , "" , "" ], + [".nifti" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Neuroimaging Informatics Technology Initiative files" , "Yes", "", "" , "" , "" ], + [".nhdr" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "'Nearly Raw Raster Data' images" , "Yes", "", "" , "" , "" ], + [".nrrd" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "'Nearly Raw Raster Data' images" , "Yes", "", "" , "" , "" ], + [".philips" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "PhilipsREC images" , "Yes", "", "" , "" , "" ], + [".philipsreq" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "PhilipsREC images" , "Yes", "", "" , "" , "" ], + [".rec" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "PhilipsREC images" , "Yes", "", "" , "" , "" ], + [".par" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "PhilipsREC images" , "Yes", "", "" , "" , "" ], + [".recpar" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "PhilipsREC images" , "Yes", "", "" , "" , "" ], + [".vox" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "VoxBoCUB images" , "Yes", "", "" , "" , "" ], + [".voxbo" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "VoxBoCUB images" , "Yes", "", "" , "" , "" ], + [".voxbocub" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "VoxBoCUB images" , "Yes", "", "" , "" , "" ], + ["*" , "itkImageFileReader" , "output0" , "unresolvedFileName" , "Try itkImageFileReader for files with no or unknown extension" , "Yes", "", "" , "" , "" ], + + // vtk image, mesh or polygon formats + [".3ds" , "vtk3DSImporter" , "output3DSImporter" , "fileName" , "VTK 3D Studio file reader" , "No", "", "" , "" , "" ], + [".av" , "vtkAVSucdReader" , "outputAVSucdReader" , "fileName" , "VTK AVS 'UCD' format file reader" , "Yes", "", "" , "" , "" ], + [".avsucd" , "vtkAVSucdReader" , "outputAVSucdReader" , "fileName" , "VTK AVS 'UCD' format file reader" , "Yes", "", "" , "" , "" ], + [".sucd" , "vtkAVSucdReader" , "outputAVSucdReader" , "fileName" , "VTK AVS 'UCD' format file reader" , "Yes", "", "" , "" , "" ], + [".inp" , "vtkAVSucdReader" , "outputAVSucdReader" , "fileName" , "VTK AVS 'UCD' format file reader" , "Yes", "", "" , "" , "" ], + [".bmp" , "vtkBMPReader" , "outputBMPReader" , "fileName" , "Bitmap" , "Yes", "ImageSave vtkBMPWriter", "" , "" , "" ], + [".byu" , "vtkBYUReader" , "outputBYUReader" , "fileName" , "VTK Movie BYU file reader" , "Yes", "vtkBYUWriter", "" , "" , "" ], + [".g" , "vtkBYUReader" , "outputBYUReader" , "fileName" , "VTK Movie BYU file reader" , "Yes", "vtkBYUWriter", "" , "" , "" ], + [".s" , "vtkBYUReader" , "outputBYUReader" , "fileName" , "VTK Movie BYU file reader" , "Yes", "vtkBYUWriter", "" , "" , "" ], + [".d" , "vtkBYUReader" , "outputBYUReader" , "fileName" , "VTK Movie BYU file reader" , "Yes", "vtkBYUWriter", "" , "" , "" ], + [".t" , "vtkBYUReader" , "outputBYUReader" , "fileName" , "VTK Movie BYU file reader" , "Yes", "vtkBYUWriter", "" , "" , "" ], + [".graph" , "vtkChacoGraphReader" , "outputChacoGraphReader" , "fileName" , "Reads Chaco files into a vtkGraph" , "Yes", "", "" , "" , "" ], + [".graph" , "vtkChacoReader" , "outputChacoReader" , "baseName" , "Reads Chaco files into a vtkUnstructuredGrid" , "Yes", "", "" , "" , "" ], + [".coords" , "vtkChacoGraphReader" , "outputChacoGraphReader" , "fileName" , "Reads binary cosmology file into a vtkUnstructuredGrid" , "Yes", "", "" , "" , "" ], + [".coords" , "vtkChacoReader" , "outputChacoReader" , "fileName" , "Reads Chaco files into a vtkUnstructuredGrid" , "Yes", "", "" , "" , "" ], + ["" , "vtkCosmoReader" , "outputCosmoReader" , "fileName" , "Reads a binary cosmology file into a vtkUnstructuredGrid" , "Yes", "", "" , "" , "" ], + //Instable? ["*" , "vtkDelimitedTextReader" , "outputDelimitedTextReader" , "fileName" , "Pulls in data from a flat, delimited text file" , "Yes", "", "" , "" , "" ], + [".dem" , "vtkDEMReader" , "outputDEMReader" , "fileName" , "Digital Elevation Model (DEM)" , "Yes", "", "" , "" , "" ], + [".dcm" , "vtkDICOMImageReader" , "outputDICOMImageReader" , "fileName" , "DICOM" , "Yes", "ImageSave", "" , "" , "" ], + [".dicom" , "vtkDICOMImageReader" , "outputDICOMImageReader" , "fileName" , "DICOM" , "Yes", "ImageSave", "" , "" , "" ], + [".case" , "vtkEnSightGoldReader" , "outputEnSightGoldReader" , "caseFileName" , "VTK Ensight ? Gold file reader" , "Yes", "", "" , "" , "" ], + [".geo" , "vtkEnSightGoldReader" , "outputEnSightGoldReader" , "caseFileName" , "VTK Ensight ? Gold file reader" , "Yes", "", "" , "" , "" ], + [".case" , "vtkEnSightGoldBinaryReader" , "outputEnSightGoldBinaryReader" , "caseFileName" , "VTK Ensight ? Gold file reader" , "Yes", "", "" , "" , "" ], + [".geo" , "vtkEnSightGoldBinaryReader" , "outputEnSightGoldBinaryReader" , "caseFileName" , "VTK Ensight ? Gold file reader" , "Yes", "", "" , "" , "" ], + [".case" , "vtkEnSightReader" , "outputEnSightReader" , "caseFileName" , "VTK Ensight ? file reader" , "Yes", "vtkEnSightWriter", "" , "" , "" ], + [".geo" , "vtkEnSightReader" , "outputEnSightReader" , "caseFileName" , "VTK Ensight ? file reader" , "Yes", "vtkEnSightWriter", "" , "" , "" ], + [".case" , "vtkEnSight6Reader" , "outputEnSight6Reader" , "caseFileName" , "VTK Ensight6 ? file reader" , "Yes", "", "" , "" , "" ], + [".geo" , "vtkEnSight6Reader" , "outputEnSight6Reader" , "caseFileName" , "VTK Ensight6 ? file reader" , "Yes", "", "" , "" , "" ], + [".case" , "vtkEnSight6BinaryReader" , "outputEnSight6BinaryReader" , "caseFileName" , "VTK Ensight6 binary ? file reader" , "Yes", "", "" , "" , "" ], + [".geo" , "vtkEnSight6BinaryReader" , "outputEnSight6BinaryReader" , "caseFileName" , "VTK Ensight6 binary ? file reader" , "Yes", "", "" , "" , "" ], + [".ex2" , "vtkExodusIIReader" , "outputExodusIIReader" , "fileName" , "VTK ExodusII unstructured grid reader" , "Yes", "vtkExodusIIWriter", "" , "" , "" ], + [".exii" , "vtkExodusIIReader" , "outputExodusIIReader" , "fileName" , "VTK ExodusII unstructured grid reader" , "Yes", "vtkExodusIIWriter", "" , "" , "" ], + [".ex2" , "vtkExodusReader" , "outputExodusReader" , "fileName" , "VTK ExodusII unstructured grid reader" , "Yes", "vtkExodusIIWriter", "" , "" , "" ], + [".exii" , "vtkExodusReader" , "outputExodusReader" , "fileName" , "VTK ExodusII unstructured grid reader" , "Yes", "vtkExodusIIWriter", "" , "" , "" ], + [".facet" , "vtkFacetReader" , "outputFacetReader" , "fileName" , "VTK Facet file reader" , "Yes", "vtkFacetWriter", "" , "" , "" ], + ["" , "vtkFixedWidthTextReader" , "outputFixedWidthTextReader" , "fileName" , "" , "Yes", "", "" , "" , "" ], + ["" , "vtkFLUENTReader" , "outputFLUENTReader" , "fileName" , "" , "Yes", "", "" , "" , "" ], + ["*" , "vtkGenericDataObjectReader" , "outputGenericDataObjectReader" , "fileName" , "" , "Yes", "vtkGenericDataObjectWriter", "" , "" , "" ], + [".mr" , "vtkGESignaReader" , "outputGESignaReader" , "fileName" , "GE Signal" , "Yes", "", "" , "" , "" ], + [".ct" , "vtkGESignaReader" , "outputGESignaReader" , "fileName" , "GE Signal" , "Yes", "", "" , "" , "" ], + [".gesigna" , "vtkGESignaReader" , "outputGESignaReader" , "fileName" , "GE Signal" , "Yes", "", "" , "" , "" ], + [".ximg" , "vtkGESignaReader" , "outputGESignaReader" , "fileName" , "GE Signal" , "Yes", "", "" , "" , "" ], + [".graph" , "vtkGraphReader" , "outputGraphReader" , "fileName" , "ASCII and binary reader for vtkGraphs" , "Yes", "vtkGraphWriter", "" , "" , "" ], + [".cube" , "vtkGaussianCubeReader" , "outputGaussianCubeReader" , "fileName" , "VTK Gaussian file reader" , "Yes", "", "" , "" , "" ], + [".case" , "vtkGenericEnSightReader" , "outputGenericEnSightReader" , "caseFileName" , "VTK Ensight ? file reader" , "Yes", "", "" , "" , "" ], + [".geo" , "vtkGenericEnSightReader" , "outputGenericEnSightReader" , "caseFileName" , "VTK Ensight ? file reader" , "Yes", "", "" , "" , "" ], + [".neu" , "vtkGAMBITReader" , "outputGAMBITReader" , "fileName" , "VTK Fluent GAMBIT ASCII file reader" , "Yes", "", "" , "" , "" ], + [".raw" , "vtkImageReader" , "outputImageReader" , "fileName" , "RAW files ?" , "Yes", "ImageSave vtkImageWriter", "" , "" , "" ], + [".img" , "vtkImageReader" , "outputImageReader" , "fileName" , "RAW files ?" , "Yes", "vtkImageWriter", "" , "" , "" ], + [".imag" , "vtkImageReader" , "outputImageReader" , "fileName" , "RAW files ?" , "Yes", "vtkImageWriter", "" , "" , "" ], + [".image" , "vtkImageReader" , "outputImageReader" , "fileName" , "RAW files ?" , "Yes", "vtkImageWriter", "" , "" , "" ], + [".isi" , "vtkISIReader" , "outputISIReader" , "fileName" , "VTK bibliographic citations reader" , "Yes", "", "" , "" , "" ], + [".jpg" , "vtkJPEGReader" , "outputJPEGReader" , "fileName" , "JPEG" , "Yes", "ImageSave vtkJPEGWriter", "" , "" , "" ], + [".jpeg" , "vtkJPEGReader" , "outputJPEGReader" , "fileName" , "JPEG" , "Yes", "ImageSave vtkJPEGWriter", "" , "" , "" ], + [".lsdyna" , "vtkLSDynaReader" , "outputLSDynaReader" , "fileName" , "VTK reader for LS-Dyna databases (d3plot)" , "Yes", "", "" , "" , "" ], + [".3dplot" , "vtkLSDynaReader" , "outputLSDynaReader" , "fileName" , "VTK reader for LS-Dyna databases (d3plot)" , "Yes", "", "" , "" , "" ], + [".tri" , "vtkMCubesReader" , "outputMCubesReader" , "fileName" , "VTK Marching Cubes file reader" , "Yes", "vtkMCubesWriter", "" , "" , "" ], + [".lim" , "vtkMCubesReader" , "outputMCubesReader" , "fileName" , "VTK Marching Cubes file reader" , "Yes", "vtkMCubesWriter", "" , "" , "" ], + [".mnc" , "vtkMINCImageReader" , "outputMINCImageReader" , "fileName" , "MINC (1.1) image data reader" , "Yes", "vtkMINCImageWriter", "" , "" , "" ], + [".minc" , "vtkMINCImageReader" , "outputMINCImageReader" , "fileName" , "MINC (1.1) image data reader" , "Yes", "vtkMINCImageWriter", "" , "" , "" ], + [".mha" , "vtkMetaImageReader" , "outputMetaImageReader" , "fileName" , "Binary UNC meta image data" , "Yes", "vtkMetaImageWriter", "" , "" , "" ], + [".mhd" , "vtkMetaImageReader" , "outputMetaImageReader" , "fileName" , "Binary UNC meta image data" , "Yes", "vtkMetaImageWriter", "" , "" , "" ], + [".mfix" , "vtkMFIXReader" , "outputMFIXReader" , "fileName" , "Unstructured grid MFIX file reader" , "Yes", "", "" , "" , "" ], + ["" , "vtkMultiBlockPLOT3DReader" , "outputMultiBlockPLOT3DReader" , "fileName" , "" , "Yes", "", "" , "" , "" ], + ["" , "vtkNetCDFCOARDSReader" , "outputNetCDFCOARDSReader" , "fileName" , "" , "Yes", "", "" , "" , "" ], + ["" , "vtkNetCDFReader" , "outputNetCDFReader" , "fileName" , "" , "Yes", "", "" , "" , "" ], + [".obj" , "vtkOBJReader" , "outputOBJReader" , "fileName" , "Wavefront OBJ file format" , "Yes", "WEMSave vtkOBJExporter", "" , "" , "" ], + ["" , "vtkOpenFOAMReader" , "outputOpenFOAMReader" , "f... [truncated message content] |
From: <awa...@us...> - 2009-08-17 09:13:44
|
Revision: 188 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=188&view=rev Author: awakeideas Date: 2009-08-17 09:13:34 +0000 (Mon, 17 Aug 2009) Log Message: ----------- Spelling fix: I like my first name better this way ;) Modified Paths: -------------- trunk/Community/General/Sources/ML/MLOsiriXImporter/A Transparent Bridge Between OsiriX and MeVisLab.docx Modified: trunk/Community/General/Sources/ML/MLOsiriXImporter/A Transparent Bridge Between OsiriX and MeVisLab.docx =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bar...@us...> - 2009-08-17 09:04:44
|
Revision: 187 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=187&view=rev Author: bartdedobbelaer Date: 2009-08-17 09:04:36 +0000 (Mon, 17 Aug 2009) Log Message: ----------- - Missing line at end of file (satisfy Linux warning) Modified Paths: -------------- trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h Modified: trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h =================================================================== --- trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h 2009-08-16 16:13:49 UTC (rev 186) +++ trunk/Community/General/Sources/ML/MLWEMCommunityModules/WEMPlane/WEMPlane.h 2009-08-17 09:04:36 UTC (rev 187) @@ -63,4 +63,4 @@ ML_END_NAMESPACE -#endif \ No newline at end of file +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wc...@us...> - 2009-08-16 16:13:54
|
Revision: 186 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=186&view=rev Author: wcl_sd Date: 2009-08-16 16:13:49 +0000 (Sun, 16 Aug 2009) Log Message: ----------- MeVisLabHub for OsiriX missing file Added Paths: ----------- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub_Prefix.pch Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub_Prefix.pch =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub_Prefix.pch (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub_Prefix.pch 2009-08-16 16:13:49 UTC (rev 186) @@ -0,0 +1,8 @@ +// +// Prefix header for all source files of the 'Duplicate' target in the 'Duplicate' project. +// + +#ifdef __OBJC__ + #import <Foundation/Foundation.h> + #import <AppKit/AppKit.h> +#endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wc...@us...> - 2009-08-16 15:51:24
|
Revision: 185 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=185&view=rev Author: wcl_sd Date: 2009-08-16 15:51:13 +0000 (Sun, 16 Aug 2009) Log Message: ----------- New Bridge for OsiriX and MeVisLab Added Paths: ----------- trunk/Community/General/Modules/ML/MLOsiriXImporter/ trunk/Community/General/Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/ trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXExporterExample.mlab trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXImporterExample.mlab trunk/Community/General/Sources/ML/MLOsiriXImporter/ trunk/Community/General/Sources/ML/MLOsiriXImporter/A Transparent Bridge Between OsiriX and MeVisLab.docx trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.h trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/project.pbxproj trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/qt_preprocess.mak trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterSystem.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter_debug.xcodeproj/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter_debug.xcodeproj/project.pbxproj trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter_debug.xcodeproj/qt_preprocess.mak trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLab2OsiriXTBridge.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLab2OsiriXTBridge.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/3DRotate.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Brush.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/CMIVDCMView.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/ConfigCoreDataDelegate.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/ConfigCoreDataDelegate.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Cross.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/English.lproj/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/English.lproj/InfoPlist.strings trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/English.lproj/locversion.plist trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Info.plist trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Length.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubGUI.xib trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisHubWindowController.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHub.xcodeproj/project.pbxproj trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHubPref.xcdatamodel/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHubPref.xcdatamodel/elements trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisLabHubPref.xcdatamodel/layout trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/MeVisOsiriXProxyProtocol.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Move.tif trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Opened Polygon.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/ trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/DCMPix.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/DCMView.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/MyPoint.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/OSIWindowController.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/PluginFilter.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/ROI.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/Schedulable.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/Scheduler.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/StaticScheduler.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/ViewerController.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX Headers/dicomFile.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge2222.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/OsiriX2MeVisLabTBridge2222.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Oval.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Pencil.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/PlugProxyForMeVisLab.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/PlugProxyForMeVisLab.m trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Point.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Polygon.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Rectangle.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Rotate.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/SharedImagesManager.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/SharedImagesManager.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/WLWW.tif trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/Zoom.tiff trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/logo.jpg trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisLabHub/version.plist trunk/Community/General/Sources/ML/MLOsiriXImporter/MeVisOsiriXProxyProtocol.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MevisProxyForOsiriX.h trunk/Community/General/Sources/ML/MLOsiriXImporter/MevisProxyForOsiriX.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/SharedImagesManager.h trunk/Community/General/Sources/ML/MLOsiriXImporter/SharedImagesManager.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXExporter.h trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXExporter.mm trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXImporter.h trunk/Community/General/Sources/ML/MLOsiriXImporter/mlOsiriXImporter.mm Added: trunk/Community/General/Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def =================================================================== --- trunk/Community/General/Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def (rev 0) +++ trunk/Community/General/Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,129 @@ +//---------------------------------------------------------------------------------- +//! MLOsiriXImporter module definitions. +/*! +// \file MLOsiriXImporter.def +// \author Chunliang Wang +// \date 2009-07-07 +*/ +//---------------------------------------------------------------------------------- + + +//---------------------------------------------------------------------------------- +// MLModule OsiriXImporter +//---------------------------------------------------------------------------------- +MLModule OsiriXImporter { + DLL = "MLOsiriXImporter" + + genre = "File" + author = "Chunliang Wang" + status = "work-in-progress" + comment = "import image from OsiriX via shared memory" + keywords = "OsriX Import" + seeAlso = "OsriXExporter" + documentation = "$(LOCAL)/html/OsiriXImporter.html" + exampleNetwork = "$(LOCAL)/networks/OsiriXImporterExample.mlab" + + Window { + Vertical { + Field OperationName { + tooltip = "The name of this operation (should be unique on the system)" + } + + Field Modified { + tooltip = "if it is true, the caching data should be recaculated." + } + Field Release { + tooltip = "When triggered, OsiriXImporter should free all memory. And set export port to empty." + } + Field ShowMeVisLabWindow { + tooltip = "If set true, MeVisLab will be activated from background" + } + Field ParaName0 { + tooltip = "The name of parameter0" + } + + Field Parameter0Value { + tooltip = "The value of parameter0" + } + + Field ParaName1 { + tooltip = "The name of parameter1" + } + + Field Parameter1Value { + tooltip = "The value of parameter1" + } + + Field ParaName2 { + tooltip = "The name of parameter2" + } + + Field Parameter2Value { + tooltip = "The value of parameter2" + } + + Field ParaName3 { + tooltip = "The name of parameter3" + } + Field Parameter3Value { + tooltip = "The value of parameter3" + } + Field ParaName4 { + tooltip = "The name of parameter4" + } + Field Parameter4Value { + tooltip = "The value of parameter4" + } + + Field ParaName5 { + tooltip = "The name of parameter5" + } + Field Parameter5Value { + tooltip = "The value of parameter5" + } + + Field DICOM_Series_UID { + tooltip = "The Series UID of the images on which the operation is performing. This can be used as a uniqe filename for saving intermediate result in MeVisLab" + } + + } + } +} // MLModule OsiriXImporter +//---------------------------------------------------------------------------------- +//! MLOsiriXExporter module definitions. +/*! +// \file MLOsiriXExporter.def +// \author Chunliang Wang +// \date 2009-08-04 +*/ +//---------------------------------------------------------------------------------- + + +//---------------------------------------------------------------------------------- +// MLModule OsiriXExporter +//---------------------------------------------------------------------------------- +MLModule OsiriXExporter { + DLL = "MLOsiriXImporter" + + genre = "File" + author = "Chunliang Wang" + status = "work-in-progress" + comment = "Export image to OsiriX" + keywords = "OsiriX Export" + seeAlso = "OsiriXImporter" + documentation = "$(LOCAL)/html/OsiriXExporter.html" + exampleNetwork = "$(LOCAL)/networks/OsiriXExporterExample.mlab" + + Window { + Vertical { + Field OperationName { + tooltip = "The name of this operation (should be unique on the system)" + } + Field SendBackButton { + tooltip = "If triggered send results back to OsiriX" + } + } + } +} // MLModule OsiriXExporter + + Added: trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXExporterExample.mlab =================================================================== --- trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXExporterExample.mlab (rev 0) +++ trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXExporterExample.mlab 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,7 @@ +module OsiriXExporter { + fields { + instanceName = OsiriXExporter + } + +} + Added: trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXImporterExample.mlab =================================================================== --- trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXImporterExample.mlab (rev 0) +++ trunk/Community/General/Modules/ML/MLOsiriXImporter/networks/OsiriXImporterExample.mlab 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,7 @@ +module OsiriXImporter { + fields { + instanceName = OsiriXImporter + } + +} + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/A Transparent Bridge Between OsiriX and MeVisLab.docx =================================================================== (Binary files differ) Property changes on: trunk/Community/General/Sources/ML/MLOsiriXImporter/A Transparent Bridge Between OsiriX and MeVisLab.docx ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.h =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.h (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.h 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,18 @@ +// +// ImporterNotificationHandler.h +// MLOsiriXImporter_debug +// +// Created by chuwa on 8/5/09. +// Copyright 2009 __MyCompanyName__. All rights reserved. +// + +#import <Cocoa/Cocoa.h> +#import "mlOsiriXImporter.h" + +@interface ImporterNotificationHandler : NSObject { + ml::OsiriXImporter* importerML; +} +- (id) initWithImporterML:(ml::OsiriXImporter*) aML; +- (void) registerSelfToNSNotificationCenter; +- (void) exporterIsAdded: (NSNotification *)notification; +@end Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.mm =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.mm (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/ImporterNotificationHandler.mm 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,40 @@ +// +// ImporterNotificationHandler.m +// MLOsiriXImporter_debug +// +// Created by chuwa on 8/5/09. +// Copyright 2009 __MyCompanyName__. All rights reserved. +// + +#import "ImporterNotificationHandler.h" + + +@implementation ImporterNotificationHandler +- (id) initWithImporterML:(ml::OsiriXImporter*) aML +{ + if ((self = [super init])) { + + importerML=aML; + + [self registerSelfToNSNotificationCenter]; + + + } + return self; + +} +-(void)registerSelfToNSNotificationCenter +{ + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(exporterIsAdded:) name:@"AnOsiriXExporterAdded" object:nil]; +} +-(void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver: self]; + [super dealloc]; +} +- (void) exporterIsAdded: (NSNotification *)notification +{ + importerML->setBridgeToOsiriX([notification object]); + [[NSNotificationCenter defaultCenter] removeObserver: self]; +} +@end Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.bat 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,3 @@ +"%MLAB_ROOT%\MeVis\Foundation\BuildTools\Scripts\createProject.bat" MLOsiriXImporter + + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.pro 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,44 @@ +# ----------------------------------------------------------------------------- +# MLOsiriXImporter project profile +# +# \file MLOsiriXImporter.pro +# \author Chunliang Wang +# \date 2009-07-07 +# ----------------------------------------------------------------------------- + +TEMPLATE = lib + +TARGET = MLOsiriXImporter + +DESTDIR = ../../../lib +DLLDESTDIR = ../../../lib + +# set high warn level (warn 4 on MSCV) +WARN = HIGH + +# add used projects here (see included pri files below for available projects) +CONFIG += dll ML + +MLAB_PACKAGES += Community_General \ + MeVisLab_Standard + +# make sure that this file is included after CONFIG and MLAB_PACKAGES +include ($(MLAB_MeVis_Foundation)/Configuration/IncludePackages.pri) + +DEFINES += MLOSIRIXIMPORTER_EXPORTS + +HEADERS += \ + MLOsiriXImporterInit.h \ + MLOsiriXImporterSystem.h \ + mlOsiriXImporter.h \ + mlOsiriXExporter.h + +SOURCES += \ + MLOsiriXImporterInit.mm \ + mlOsiriXImporter.mm \ + mlOsiriXExporter.mm + +# additional files that are NOT compiled +RELATEDFILES += \ + ../../../Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.sh 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,35 @@ +#! /bin/bash +#----------------------------------------------------------------------------- +# ----------------------------------------------------------------------- +# +# Copyright (c) 2001-2009, MeVis Medical Solutions AG, Bremen, Germany +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of MeVis Medical Solutions AG nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY MEVIS MEDICAL SOLUTIONS AG ''AS IS'' AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL MEVIS MEDICAL SOLUTIONS AG BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#----------------------------------------------------------------------------- +if [ "`uname -s`" = "Darwin" && "$MLAB_ROOT" = "" ]; then + echo "Generate Xcode projects by double-clicking the file 'MLOsiriXImporter.pro' in Finder or use the MeVisLabProjectGenerator.app from the command line to customize the project creation." +else + python $MLAB_ROOT/MeVis/Foundation/BuildTools/Scripts/createProject.py MLOsiriXImporter +fi + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/project.pbxproj =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/project.pbxproj (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/project.pbxproj 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,618 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXBuildFile section */ + 1BBB0A3DF8176E3D7F0EC937 /* MLLinearAlgebra in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 639C40EFA979D07223FB6D58 /* MLLinearAlgebra */; }; + 3E90BBBE7067749EB6E1A9AC /* MLMemoryManager in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 0396DDF436C166B7BD26D0B2 /* MLMemoryManager */; }; + 83F2502FFDB5618D046FE2CD /* ML in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 650C0173642193369E858602 /* ML */; }; + 93F55C3A15ECCECAE7259376 /* boost_thread-xgcc40-mt-1_36 in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 6CA34A6677CCFB3CB5DC43C3 /* boost_thread-xgcc40-mt-1_36 */; }; + B914129F10385C69007C9DC7 /* MeVisLab2OsiriXTBridge.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B914129A10385C69007C9DC7 /* MeVisLab2OsiriXTBridge.mm */; }; + B91412A010385C69007C9DC7 /* SharedImagesManager.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B914129B10385C69007C9DC7 /* SharedImagesManager.mm */; }; + B91412A110385C69007C9DC7 /* mlOsiriXExporter.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B914129C10385C69007C9DC7 /* mlOsiriXExporter.mm */; }; + B91412A210385C69007C9DC7 /* mlOsiriXImporter.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B914129D10385C69007C9DC7 /* mlOsiriXImporter.mm */; }; + B91412A310385C69007C9DC7 /* MLOsiriXImporterInit.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B914129E10385C69007C9DC7 /* MLOsiriXImporterInit.mm */; }; + B914132D10385CD4007C9DC7 /* Foundation.framework in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = B914132C10385CD4007C9DC7 /* Foundation.framework */; }; + B914133210385CEB007C9DC7 /* Cocoa.framework in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = B914133110385CEB007C9DC7 /* Cocoa.framework */; }; + B914133410385D35007C9DC7 /* libMLBase.dylib in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = B914133310385D35007C9DC7 /* libMLBase.dylib */; }; + B9F001BD10233AE200B69533 /* libMLOsiriXImporter.dylib in Project Copy */ = {isa = PBXBuildFile; fileRef = B9F001BB10233AE200B69533 /* libMLOsiriXImporter.dylib */; }; + F104824F7EFA3CD00301325E /* MLUtilities in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 983DA09CED0D1524CC13DD71 /* MLUtilities */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + F6069D5A5DA8AA28EDB8B3C6 /* Project Copy */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /Users/chuwa/develop/MeVis/trunk/Community/General/lib; + dstSubfolderSpec = 0; + files = ( + B9F001BD10233AE200B69533 /* libMLOsiriXImporter.dylib in Project Copy */, + ); + name = "Project Copy"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 0396DDF436C166B7BD26D0B2 /* MLMemoryManager */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = MLMemoryManager; path = /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib/libMLMemoryManager.dylib; sourceTree = "<absolute>"; }; + 25C7BAC79DA03EA6D5BE1D3C /* MLOsiriXImporter.def */ = {isa = PBXFileReference; lastKnownFileType = text; name = MLOsiriXImporter.def; path = ../../../Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def; sourceTree = "<group>"; }; + 639C40EFA979D07223FB6D58 /* MLLinearAlgebra */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = MLLinearAlgebra; path = /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib/libMLLinearAlgebra.dylib; sourceTree = "<absolute>"; }; + 650C0173642193369E858602 /* ML */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = ML; path = /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib/libML.dylib; sourceTree = "<absolute>"; }; + 6CA34A6677CCFB3CB5DC43C3 /* boost_thread-xgcc40-mt-1_36 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "boost_thread-xgcc40-mt-1_36"; path = "/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/lib/libboost_thread-xgcc40-mt-1_36.dylib"; sourceTree = "<absolute>"; }; + 7BFBD16BCB5F8557F53D3809 /* MLOsiriXImporter.pro */ = {isa = PBXFileReference; lastKnownFileType = text; path = MLOsiriXImporter.pro; sourceTree = "<group>"; }; + 983DA09CED0D1524CC13DD71 /* MLUtilities */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = MLUtilities; path = /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib/libMLUtilities.dylib; sourceTree = "<absolute>"; }; + B914129A10385C69007C9DC7 /* MeVisLab2OsiriXTBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MeVisLab2OsiriXTBridge.mm; sourceTree = "<group>"; }; + B914129B10385C69007C9DC7 /* SharedImagesManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedImagesManager.mm; sourceTree = "<group>"; }; + B914129C10385C69007C9DC7 /* mlOsiriXExporter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = mlOsiriXExporter.mm; sourceTree = "<group>"; }; + B914129D10385C69007C9DC7 /* mlOsiriXImporter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = mlOsiriXImporter.mm; sourceTree = "<group>"; }; + B914129E10385C69007C9DC7 /* MLOsiriXImporterInit.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MLOsiriXImporterInit.mm; sourceTree = "<group>"; }; + B91412A410385C7B007C9DC7 /* MeVisLab2OsiriXTBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeVisLab2OsiriXTBridge.h; sourceTree = "<group>"; }; + B91412A510385C7B007C9DC7 /* SharedImagesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedImagesManager.h; sourceTree = "<group>"; }; + B91412A610385C7B007C9DC7 /* mlOsiriXExporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mlOsiriXExporter.h; sourceTree = "<group>"; }; + B91412A710385C7B007C9DC7 /* mlOsiriXImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mlOsiriXImporter.h; sourceTree = "<group>"; }; + B91412A810385C7B007C9DC7 /* MeVisOsiriXProxyProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeVisOsiriXProxyProtocol.h; sourceTree = "<group>"; }; + B91412A910385C7B007C9DC7 /* MLOsiriXImporterInit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLOsiriXImporterInit.h; sourceTree = "<group>"; }; + B91412AA10385C7B007C9DC7 /* MLOsiriXImporterSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLOsiriXImporterSystem.h; sourceTree = "<group>"; }; + B914132C10385CD4007C9DC7 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; + B914133110385CEB007C9DC7 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; + B914133310385D35007C9DC7 /* libMLBase.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMLBase.dylib; path = /Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib/libMLBase.dylib; sourceTree = "<absolute>"; }; + B9F001BB10233AE200B69533 /* libMLOsiriXImporter.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libMLOsiriXImporter.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 2A1043669E6E5A7426EA502A /* Frameworks & Libraries */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 83F2502FFDB5618D046FE2CD /* ML in Frameworks & Libraries */, + 1BBB0A3DF8176E3D7F0EC937 /* MLLinearAlgebra in Frameworks & Libraries */, + 3E90BBBE7067749EB6E1A9AC /* MLMemoryManager in Frameworks & Libraries */, + F104824F7EFA3CD00301325E /* MLUtilities in Frameworks & Libraries */, + 93F55C3A15ECCECAE7259376 /* boost_thread-xgcc40-mt-1_36 in Frameworks & Libraries */, + B914132D10385CD4007C9DC7 /* Foundation.framework in Frameworks & Libraries */, + B914133210385CEB007C9DC7 /* Cocoa.framework in Frameworks & Libraries */, + B914133410385D35007C9DC7 /* libMLBase.dylib in Frameworks & Libraries */, + ); + name = "Frameworks & Libraries"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 05596AB53D8D521C69802C27 /* MLOsiriXImporter */ = { + isa = PBXGroup; + children = ( + FB61758D0F0FDA4BA867C3D5 /* Sources */, + 883D7615C4D2DE3FA1218F12 /* Headers */, + 7CABE3C80E79AD2B307756D2 /* Sources [qmake] */, + 19D61F18B2F38D0DC87E7D4B /* Sources [Related Files] */, + ED1E82605DD74B483AF3C982 /* External Frameworks and Libraries */, + B9F001BC10233AE200B69533 /* Products */, + ); + name = MLOsiriXImporter; + sourceTree = "<group>"; + }; + 1858B2A289DE2AF6BC1E59D9 /* ML */ = { + isa = PBXGroup; + children = ( + 4558565CD3BFE5BCBBC8650F /* MLOsiriXImporter */, + ); + name = ML; + sourceTree = "<group>"; + }; + 19D61F18B2F38D0DC87E7D4B /* Sources [Related Files] */ = { + isa = PBXGroup; + children = ( + 78826E689BEDD00FC7D51DA2 /* .. */, + ); + name = "Sources [Related Files]"; + sourceTree = "<group>"; + }; + 4558565CD3BFE5BCBBC8650F /* MLOsiriXImporter */ = { + isa = PBXGroup; + children = ( + 25C7BAC79DA03EA6D5BE1D3C /* MLOsiriXImporter.def */, + ); + name = MLOsiriXImporter; + sourceTree = "<group>"; + }; + 78826E689BEDD00FC7D51DA2 /* .. */ = { + isa = PBXGroup; + children = ( + 7BA26FA3DF94E452AB39912C /* .. */, + ); + name = ..; + sourceTree = "<group>"; + }; + 7BA26FA3DF94E452AB39912C /* .. */ = { + isa = PBXGroup; + children = ( + FEB573B7CDBCE52BAF2BAA43 /* .. */, + ); + name = ..; + sourceTree = "<group>"; + }; + 7CABE3C80E79AD2B307756D2 /* Sources [qmake] */ = { + isa = PBXGroup; + children = ( + 7BFBD16BCB5F8557F53D3809 /* MLOsiriXImporter.pro */, + ); + name = "Sources [qmake]"; + sourceTree = "<group>"; + }; + 883D7615C4D2DE3FA1218F12 /* Headers */ = { + isa = PBXGroup; + children = ( + B91412A410385C7B007C9DC7 /* MeVisLab2OsiriXTBridge.h */, + B91412A510385C7B007C9DC7 /* SharedImagesManager.h */, + B91412A610385C7B007C9DC7 /* mlOsiriXExporter.h */, + B91412A710385C7B007C9DC7 /* mlOsiriXImporter.h */, + B91412A810385C7B007C9DC7 /* MeVisOsiriXProxyProtocol.h */, + B91412A910385C7B007C9DC7 /* MLOsiriXImporterInit.h */, + B91412AA10385C7B007C9DC7 /* MLOsiriXImporterSystem.h */, + ); + name = Headers; + sourceTree = "<group>"; + }; + B9F001BC10233AE200B69533 /* Products */ = { + isa = PBXGroup; + children = ( + B9F001BB10233AE200B69533 /* libMLOsiriXImporter.dylib */, + ); + name = Products; + sourceTree = "<group>"; + }; + D61DEF2323826D36DB78B32E /* Modules */ = { + isa = PBXGroup; + children = ( + 1858B2A289DE2AF6BC1E59D9 /* ML */, + ); + name = Modules; + sourceTree = "<group>"; + }; + ED1E82605DD74B483AF3C982 /* External Frameworks and Libraries */ = { + isa = PBXGroup; + children = ( + B914132C10385CD4007C9DC7 /* Foundation.framework */, + B914133110385CEB007C9DC7 /* Cocoa.framework */, + 650C0173642193369E858602 /* ML */, + B914133310385D35007C9DC7 /* libMLBase.dylib */, + 639C40EFA979D07223FB6D58 /* MLLinearAlgebra */, + 0396DDF436C166B7BD26D0B2 /* MLMemoryManager */, + 983DA09CED0D1524CC13DD71 /* MLUtilities */, + 6CA34A6677CCFB3CB5DC43C3 /* boost_thread-xgcc40-mt-1_36 */, + ); + name = "External Frameworks and Libraries"; + sourceTree = "<group>"; + }; + FB61758D0F0FDA4BA867C3D5 /* Sources */ = { + isa = PBXGroup; + children = ( + B914129A10385C69007C9DC7 /* MeVisLab2OsiriXTBridge.mm */, + B914129B10385C69007C9DC7 /* SharedImagesManager.mm */, + B914129C10385C69007C9DC7 /* mlOsiriXExporter.mm */, + B914129D10385C69007C9DC7 /* mlOsiriXImporter.mm */, + B914129E10385C69007C9DC7 /* MLOsiriXImporterInit.mm */, + ); + name = Sources; + sourceTree = "<group>"; + }; + FEB573B7CDBCE52BAF2BAA43 /* .. */ = { + isa = PBXGroup; + children = ( + D61DEF2323826D36DB78B32E /* Modules */, + ); + name = ..; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 84DF9BF26397BB1ED8618223 /* libMLOsiriXImporter */ = { + isa = PBXNativeTarget; + buildConfigurationList = B9F001C810233AEE00B69533 /* Build configuration list for PBXNativeTarget "libMLOsiriXImporter" */; + buildPhases = ( + A0A52A2ADF7A1E2A99738674 /* Qt Preprocessors */, + F6069D5A5DA8AA28EDB8B3C6 /* Project Copy */, + C29B8785722055ED95EF7B57 /* Build Sources */, + 2A1043669E6E5A7426EA502A /* Frameworks & Libraries */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = libMLOsiriXImporter; + productInstallPath = ../../../lib/; + productName = libMLOsiriXImporter; + productReference = B9F001BB10233AE200B69533 /* libMLOsiriXImporter.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 91B15E841AA80083484172DE /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 2A951308CDB28F104D0A4BD2 /* Build configuration list for PBXProject "MLOsiriXImporter" */; + compatibilityVersion = "Xcode 2.4"; + hasScannedForEncodings = 1; + mainGroup = 05596AB53D8D521C69802C27 /* MLOsiriXImporter */; + productRefGroup = B9F001BC10233AE200B69533 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 84DF9BF26397BB1ED8618223 /* libMLOsiriXImporter */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXShellScriptBuildPhase section */ + A0A52A2ADF7A1E2A99738674 /* Qt Preprocessors */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + name = "Qt Preprocessors"; + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "make -C /Users/chuwa/develop/MeVis/trunk/Community/General/Sources/ML/MLOsiriXImporter -f MLOsiriXImporter.xcodeproj/qt_preprocess.mak"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + C29B8785722055ED95EF7B57 /* Build Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B914129F10385C69007C9DC7 /* MeVisLab2OsiriXTBridge.mm in Build Sources */, + B91412A010385C69007C9DC7 /* SharedImagesManager.mm in Build Sources */, + B91412A110385C69007C9DC7 /* mlOsiriXExporter.mm in Build Sources */, + B91412A210385C69007C9DC7 /* mlOsiriXImporter.mm in Build Sources */, + B91412A310385C69007C9DC7 /* MLOsiriXImporterInit.mm in Build Sources */, + ); + name = "Build Sources"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 8DB1DD96F65B1BF1FFC506E0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + }; + name = Debug; + }; + 95E1EB2E5DDD587BE5B3E548 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + }; + name = Release; + }; + B9F001C010233AE300B69533 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUILD_ROOT = /Users/chuwa/develop/MeVis/trunk/Community/General/Sources/ML/MLOsiriXImporter; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1.0; + DYLIB_CURRENT_VERSION = 1.0.0; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + HEADER_SEARCH_PATHS = ( + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/Sources/ML/MLBase, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/SharedIncludes, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/ML/include, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLMemoryManager/Include, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/Sources/misc/boost, + ., + tmp/release/ui, + /usr/local/include, + /System/Library/Frameworks/CarbonCore.framework/Headers, + "/Users/chuwa/Applications/MeVisLab.app/Contents/Support/MeVisLabProjectGenerator.app/Contents/Resources/mkspecs/macx-xcode", + ); + INSTALL_DIR = /Users/chuwa/develop/MeVis/trunk/Community/General/Sources/ML/MLOsiriXImporter/../../../lib/; + INSTALL_PATH = ""; + LEXFLAGS = ""; + LIBRARY_SEARCH_PATHS = ( + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/lib, + /Users/chuwa/develop/MeVis/trunk/Community/General/lib, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib, + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_APPS_DIR)/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib\""; + LIBRARY_STYLE = DYNAMIC; + MACH_O_TYPE = mh_dylib; + MACOSX_DEPLOYMENT_TARGET = 10.5; + OBJROOT = tmp/release/obj/; + OTHER_CFLAGS = ( + "-pipe", + "-O2", + "-Wall", + "-W", + "-fPIC", + "-DMEVIS_TARGET=MLOsiriXImporter", + "-DBOOST_ALL_DYN_LINK", + "-DMeVisLab", + "-DILAB5", + "-DMEVISLAB", + "-DUNIX", + "-DUNICODE", + "-D__STDC_LIMIT_MACROS", + "-D__STDC_CONSTANT_MACROS", + "-DMACOS", + "-Dlinux", + "-DLINUX", + "-DLinux", + "-DMLOSIRIXIMPORTER_EXPORTS", + ); + OTHER_CPLUSPLUSFLAGS = ( + "-pipe", + "-O2", + "-Wall", + "-W", + "-fPIC", + "-DMEVIS_TARGET=MLOsiriXImporter", + "-DBOOST_ALL_DYN_LINK", + "-DMeVisLab", + "-DILAB5", + "-DMEVISLAB", + "-DUNIX", + "-DUNICODE", + "-D__STDC_LIMIT_MACROS", + "-D__STDC_CONSTANT_MACROS", + "-DMACOS", + "-Dlinux", + "-DLINUX", + "-DLinux", + "-DMLOSIRIXIMPORTER_EXPORTS", + ); + OTHER_LDFLAGS = ( + "-headerpad_max_install_names", + "-single_module", + "-dynamiclib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/lib", + "-L/Users/chuwa/develop/MeVis/trunk/Community/General/lib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib", + ); + OTHER_REZFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = libMLOsiriXImporter; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ""; + YACCFLAGS = "-d"; + }; + name = Debug; + }; + B9F001C110233AE300B69533 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUILD_ROOT = /Users/chuwa/develop/MeVis/trunk/Community/General/Sources/ML/MLOsiriXImporter; + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = 1.0; + DYLIB_CURRENT_VERSION = 1.0.0; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + HEADER_SEARCH_PATHS = ( + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/SharedIncludes, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/ML/include, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLMemoryManager/Include, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/Sources/misc/boost, + ., + tmp/release/ui, + /usr/local/include, + /System/Library/Frameworks/CarbonCore.framework/Headers, + "/Users/chuwa/Applications/MeVisLab.app/Contents/Support/MeVisLabProjectGenerator.app/Contents/Resources/mkspecs/macx-xcode", + ); + INSTALL_DIR = /Users/chuwa/develop/MeVis/trunk/Community/General/Sources/ML/MLOsiriXImporter/../../../lib/; + INSTALL_PATH = ""; + LEXFLAGS = ""; + LIBRARY_SEARCH_PATHS = ( + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/lib, + /Users/chuwa/develop/MeVis/trunk/Community/General/lib, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib, + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_APPS_DIR)/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib\""; + LIBRARY_STYLE = DYNAMIC; + MACH_O_TYPE = mh_dylib; + MACOSX_DEPLOYMENT_TARGET = 10.5; + OBJROOT = tmp/release/obj/; + OTHER_CFLAGS = ( + "-pipe", + "-O2", + "-Wall", + "-W", + "-fPIC", + "-DMEVIS_TARGET=MLOsiriXImporter", + "-DBOOST_ALL_DYN_LINK", + "-DMeVisLab", + "-DILAB5", + "-DMEVISLAB", + "-DUNIX", + "-DUNICODE", + "-D__STDC_LIMIT_MACROS", + "-D__STDC_CONSTANT_MACROS", + "-DMACOS", + "-Dlinux", + "-DLINUX", + "-DLinux", + "-DMLOSIRIXIMPORTER_EXPORTS", + ); + OTHER_CPLUSPLUSFLAGS = ( + "-pipe", + "-O2", + "-Wall", + "-W", + "-fPIC", + "-DMEVIS_TARGET=MLOsiriXImporter", + "-DBOOST_ALL_DYN_LINK", + "-DMeVisLab", + "-DILAB5", + "-DMEVISLAB", + "-DUNIX", + "-DUNICODE", + "-D__STDC_LIMIT_MACROS", + "-D__STDC_CONSTANT_MACROS", + "-DMACOS", + "-Dlinux", + "-DLINUX", + "-DLinux", + "-DMLOSIRIXIMPORTER_EXPORTS", + ); + OTHER_LDFLAGS = ( + "-headerpad_max_install_names", + "-single_module", + "-dynamiclib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/lib", + "-L/Users/chuwa/develop/MeVis/trunk/Community/General/lib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib", + ); + OTHER_REZFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = libMLOsiriXImporter; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ""; + YACCFLAGS = "-d"; + }; + name = Release; + }; + B9F001C210233AE300B69533 /* Default */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUILD_ROOT = /Users/chuwa/develop/MeVis/trunk/Community/General/Sources/ML/MLOsiriXImporter; + DYLIB_COMPATIBILITY_VERSION = 1.0; + DYLIB_CURRENT_VERSION = 1.0.0; + HEADER_SEARCH_PATHS = ( + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/SharedIncludes, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/ML/include, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLMemoryManager/Include, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/Sources/misc/boost, + ., + tmp/release/ui, + /usr/local/include, + /System/Library/Frameworks/CarbonCore.framework/Headers, + "/Users/chuwa/Applications/MeVisLab.app/Contents/Support/MeVisLabProjectGenerator.app/Contents/Resources/mkspecs/macx-xcode", + ); + INSTALL_DIR = /Users/chuwa/develop/MeVis/trunk/Community/General/Sources/ML/MLOsiriXImporter/../../../lib/; + INSTALL_PATH = ""; + LEXFLAGS = ""; + LIBRARY_SEARCH_PATHS = ( + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/lib, + /Users/chuwa/develop/MeVis/trunk/Community/General/lib, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib, + /Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib, + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SYSTEM_APPS_DIR)/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib\""; + LIBRARY_STYLE = DYNAMIC; + MACH_O_TYPE = mh_dylib; + MACOSX_DEPLOYMENT_TARGET = 10.5; + OBJROOT = tmp/release/obj/; + OTHER_CFLAGS = ( + "-pipe", + "-O2", + "-Wall", + "-W", + "-fPIC", + "-DMEVIS_TARGET=MLOsiriXImporter", + "-DBOOST_ALL_DYN_LINK", + "-DMeVisLab", + "-DILAB5", + "-DMEVISLAB", + "-DUNIX", + "-DUNICODE", + "-D__STDC_LIMIT_MACROS", + "-D__STDC_CONSTANT_MACROS", + "-DMACOS", + "-Dlinux", + "-DLINUX", + "-DLinux", + "-DMLOSIRIXIMPORTER_EXPORTS", + ); + OTHER_CPLUSPLUSFLAGS = ( + "-pipe", + "-O2", + "-Wall", + "-W", + "-fPIC", + "-DMEVIS_TARGET=MLOsiriXImporter", + "-DBOOST_ALL_DYN_LINK", + "-DMeVisLab", + "-DILAB5", + "-DMEVISLAB", + "-DUNIX", + "-DUNICODE", + "-D__STDC_LIMIT_MACROS", + "-D__STDC_CONSTANT_MACROS", + "-DMACOS", + "-Dlinux", + "-DLINUX", + "-DLinux", + "-DMLOSIRIXIMPORTER_EXPORTS", + ); + OTHER_LDFLAGS = ( + "-headerpad_max_install_names", + "-single_module", + "-dynamiclib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/lib", + "-L/Users/chuwa/develop/MeVis/trunk/Community/General/lib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVisLab/Standard/lib", + "-L/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/lib", + ); + OTHER_REZFLAGS = ""; + PREBINDING = NO; + PRODUCT_NAME = libMLOsiriXImporter; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ""; + YACCFLAGS = "-d"; + }; + name = Default; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 2A951308CDB28F104D0A4BD2 /* Build configuration list for PBXProject "MLOsiriXImporter" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 8DB1DD96F65B1BF1FFC506E0 /* Debug */, + 95E1EB2E5DDD587BE5B3E548 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B9F001C810233AEE00B69533 /* Build configuration list for PBXNativeTarget "libMLOsiriXImporter" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B9F001C010233AE300B69533 /* Debug */, + B9F001C110233AE300B69533 /* Release */, + B9F001C210233AE300B69533 /* Default */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Default; + }; +/* End XCConfigurationList section */ + }; + rootObject = 91B15E841AA80083484172DE /* Project object */; +} Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/qt_preprocess.mak =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/qt_preprocess.mak (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter.xcodeproj/qt_preprocess.mak 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,51 @@ +############################################################################# +# Makefile for building: libMLOsiriXImporter.dylib +# Generated by qmake (2.01a) (Qt 4.4.3) on: Tue Jul 7 15:18:25 2009 +# Project: MLOsiriXImporter.pro +# Template: lib +# Command: /Users/chuwa/Applications/MeVisLab.app/Contents/Support/MeVisLabProjectGenerator.app/Contents/Resources/qmake -spec /Users/chuwa/Applications/MeVisLab.app/Contents/Support/MeVisLabProjectGenerator.app/Contents/Resources/mkspecs/macx-xcode -macx INITIAL_CONFIG=$$CONFIG -o MLOsiriXImporter.xcodeproj/project.pbxproj MLOsiriXImporter.pro +############################################################################# + +MOC = /bin/moc +UIC = /bin/uic +LEX = flex +LEXFLAGS = +YACC = yacc +YACCFLAGS = -d +DEFINES = -DMEVIS_TARGET=MLOsiriXImporter -DBOOST_ALL_DYN_LINK -DMeVisLab -DILAB5 -DMEVISLAB -DUNIX -DUNICODE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DMACOS -Dlinux -DLINUX -DLinux -DMLOSIRIXIMPORTER_EXPORTS +INCPATH = -I/Users/chuwa/Applications/MeVisLab.app/Contents/Support/MeVisLabProjectGenerator.app/Contents/Resources/mkspecs/macx-xcode -I. -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/SharedIncludes -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/ML/include -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLLinearAlgebra -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLUtilities -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/Foundation/Sources/MLMemoryManager/Include -I/Users/chuwa/Applications/MeVisLab.app/Contents/Packages/MeVis/ThirdParty/Sources/misc/boost -I. -Itmp/release/ui -I/usr/local/include -I/System/Library/Frameworks/CarbonCore.framework/Headers +DEL_FILE = rm -f +MOVE = mv -f + +IMAGES = +PARSERS = +preprocess: $(PARSERS) compilers +clean preprocess_clean: parser_clean compiler_clean + +parser_clean: +compilers: $(OBJECTS_DIR)mlab_related_dummy_file +compiler_related_make_all: $(OBJECTS_DIR)mlab_related_dummy_file +compiler_related_clean: + -$(DEL_FILE) $(OBJECTS_DIR)mlab_related_dummy_file +$(OBJECTS_DIR)mlab_related_dummy_file: ../../../Modules/ML/MLOsiriXImporter/MLOsiriXImporter.def + true + +compiler_objective_c_make_all: +compiler_objective_c_clean: +compiler_rez_source_make_all: +compiler_rez_source_clean: +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_uic_make_all: +compiler_uic_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_related_clean + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.h =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.h (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.h 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,25 @@ +//---------------------------------------------------------------------------------- +//! Dynamic library and runtime type system initialization. +/*! +// \file MLOsiriXImporterInit.h +// \author Chunliang Wang +// \date 2009-07-07 +*/ +//---------------------------------------------------------------------------------- + + +#ifndef __MLOsiriXImporterInit_H +#define __MLOsiriXImporterInit_H + + +ML_START_NAMESPACE + +//! Calls init functions of all modules to add their types to the runtime type +//! system of the ML. +int MLOsiriXImporterInit (); + +ML_END_NAMESPACE + +#endif // __MLOsiriXImporterInit_H + + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.mm =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.mm (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterInit.mm 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,44 @@ +//---------------------------------------------------------------------------------- +//! Dynamic library and runtime type system initialization. +/*! +// \file MLOsiriXImporterInit.cpp +// \author Chunliang Wang +// \date 2009-07-07 +*/ +//---------------------------------------------------------------------------------- + + +// Local includes +#include "MLOsiriXImporterSystem.h" + +// Include definition of ML_INIT_LIBRARY. +#include "mlLibraryInitMacros.h" + +// Include all module headers ... +#include "mlOsiriXImporter.h" +#include "mlOsiriXExporter.h" + + +ML_START_NAMESPACE + +//---------------------------------------------------------------------------------- +//! Calls init functions of all modules to add their types to the runtime type +//! system of the ML. +//---------------------------------------------------------------------------------- +int MLOsiriXImporterInit () +{ + ML_TRACE_IN("MLOsiriXImporterInit ()") + + OsiriXImporter::initClass(); + // Add initClass calls from all other modules here... + OsiriXExporter::initClass(); + + return 1; +} + +ML_END_NAMESPACE + + +//! Calls the init method implemented above during load of shared library. +ML_INIT_LIBRARY(MLOsiriXImporterInit) + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterSystem.h =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterSystem.h (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporterSystem.h 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,33 @@ +//---------------------------------------------------------------------------------- +//! Project global and OS specific declarations. +/*! +// \file MLOsiriXImporterSystem.h +// \author Chunliang Wang +// \date 2009-07-07 +*/ +//---------------------------------------------------------------------------------- + + +#ifndef __MLOsiriXImporterSystem_H +#define __MLOsiriXImporterSystem_H + + +// DLL export macro definition +#ifdef WIN32 +#ifdef MLOSIRIXIMPORTER_EXPORTS +// Use the MLOSIRIXIMPORTER_EXPORT macro to export classes and functions +#define MLOSIRIXIMPORTER_EXPORT __declspec(dllexport) +#else +// If included by external modules, exported symbols are declared as import symbols +#define MLOSIRIXIMPORTER_EXPORT __declspec(dllimport) +#endif + +#else +// No export declarations are necessary for non-Windows systems +#define MLOSIRIXIMPORTER_EXPORT +#endif + + +#endif // __MLOsiriXImporterSystem_H + + Added: trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter_debug.xcodeproj/project.pbxproj =================================================================== --- trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter_debug.xcodeproj/project.pbxproj (rev 0) +++ trunk/Community/General/Sources/ML/MLOsiriXImporter/MLOsiriXImporter_debug.xcodeproj/project.pbxproj 2009-08-16 15:51:13 UTC (rev 185) @@ -0,0 +1,646 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXBuildFile section */ + 1A570F4D3FEB07A3EC4D6FEE /* ML_debug in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 22714C4463A4F1862E994DE0 /* ML_debug */; }; + 51AC20053BF3711383DADDEE /* MLUtilities_debug in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = B4AB392E468F2AB2265B0DE3 /* MLUtilities_debug */; }; + B91362821029752900C21B6D /* MeVisLab2OsiriXTBridge.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B91362811029752900C21B6D /* MeVisLab2OsiriXTBridge.mm */; }; + B93F27A0102872D3004C2554 /* SharedImagesManager.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B93F279F102872D3004C2554 /* SharedImagesManager.mm */; }; + B97ECFCC1033A74C00E7F1E9 /* libMLBase_debug.dylib in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = B97ECFCB1033A74C00E7F1E9 /* libMLBase_debug.dylib */; }; + B98F13DB100382B400CAAC21 /* libMLOsiriXImporter_debug.dylib in Project Copy */ = {isa = PBXBuildFile; fileRef = B98F13D9100382B400CAAC21 /* libMLOsiriXImporter_debug.dylib */; }; + B9CECC851004E54F00015EEC /* Cocoa.framework in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = B9CECC841004E54F00015EEC /* Cocoa.framework */; }; + B9CECC891004E55C00015EEC /* Foundation.framework in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = B9CECC881004E55C00015EEC /* Foundation.framework */; }; + B9F5A1914BA927C868214462 /* MLMemoryManager_debug in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 139CC4B9050016A0C0D8C5FB /* MLMemoryManager_debug */; }; + B9F6777C1028E3A50061D45A /* mlOsiriXExporter.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = B9F6777A1028E3A50061D45A /* mlOsiriXExporter.mm */; }; + C5115CA3D5DCB9DCC1FBEFEB /* MLLinearAlgebra_debug in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = BBACF83D6A2781E09BDF440A /* MLLinearAlgebra_debug */; }; + D5973D63170B3E0649BC87DF /* MLOsiriXImporterInit.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = 2D62CB0FCA44C0859FA7E9A6 /* MLOsiriXImporterInit.mm */; settings = {ATTRIBUTES = (); }; }; + F48EE120B373A7A82FC38D2F /* boost_thread-xgcc40-mt-d-1_36 in Frameworks & Libraries */ = {isa = PBXBuildFile; fileRef = 63D842A671870C6EC442677C /* boost_thread-xgcc40-mt-d-1_36 */; }; + F7A6061EB2D921838BB58D49 /* mlOsiriXImporter.mm in Build Sources */ = {isa = PBXBuildFile; fileRef = 0094FEC7719E76FA95ECA588 /* mlOsiriXImporter.mm */; settings = {ATTRIBUTES = (); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + F6069D5A5DA8AA28EDB8B3C6 /* Project Copy */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /Users/chuwa/develop/MeVis/trunk/Community/General/lib; + dstSubfolderSpec = 0; + files = ( + B98F13DB100382B400CAAC21 /* libMLOsiriXImporter_debug.dylib in Project Copy */, + ); + name = "Project Copy"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 0094FEC7719E76FA95ECA588 /* mlOsiriXImporter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = mlOsiriXImporter... [truncated message content] |
From: <bar...@us...> - 2009-08-14 09:55:52
|
Revision: 184 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=184&view=rev Author: bartdedobbelaer Date: 2009-08-14 09:55:42 +0000 (Fri, 14 Aug 2009) Log Message: ----------- - Added example networks Modified Paths: -------------- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.def Added Paths: ----------- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2DExample.mlab trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3DExample.mlab Modified: trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.def =================================================================== --- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.def 2009-08-14 09:15:44 UTC (rev 183) +++ trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2D.def 2009-08-14 09:55:42 UTC (rev 184) @@ -6,6 +6,7 @@ author = "Bart De Dobbelaer" status = "work-in-progress" externalDefinition = "$(LOCAL)/CombinedOrthoView3D.script" + exampleNetwork = "$(LOCAL)/CombinedOrthoView3DExample.mlab" } // MacroModule CombinedOrthoView3D @@ -16,6 +17,7 @@ author = "Bart De Dobbelaer" status = "work-in-progress" externalDefinition = "$(LOCAL)/CombinedOrthoView2D.script" + exampleNetwork = "$(LOCAL)/CombinedOrthoView2DExample.mlab" } // MacroModule CombinedOrthoView2D Added: trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2DExample.mlab =================================================================== --- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2DExample.mlab (rev 0) +++ trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView2DExample.mlab 2009-08-14 09:55:42 UTC (rev 184) @@ -0,0 +1,414 @@ +// MDL v1 utf8 +network { + watchlist = "" +} +module Diagram2D { + internal { + frame = "537 269 96 56" + moduleGroupName = "" + } + fields { + instanceName = Diagram2D + minX = 500 + maxX = 1500 + autoRangeX = TRUE + minY = 8 + maxY = 864 + autoRangeY = TRUE + axisColor = "1 1 1" + axisRotation = LeftBottom + drawDiagramTitle = FALSE + diagramTitleString = "" + borderH = 33 + autoBorderH = TRUE + borderV = 25 + autoBorderV = TRUE + drawAxisX = TRUE + drawTicksX = TRUE + drawLabelsX = TRUE + drawAxisTitleX = FALSE + axisTitleStringX = "X [dn]" + drawAxisY = TRUE + drawTicksY = TRUE + drawLabelsY = TRUE + drawAxisTitleY = FALSE + axisTitleStringY = "Y [dn]" + curveColor = "1 1 1" + lineStyle = Solid + markerType = None + markerSize = 10 + areaOpacity = 0.5 + lineWidth = 1 + antiAlias = FALSE + button1 = IGNORED + button2 = IGNORED + button3 = IGNORED + shift = IGNORED + ctrl = IGNORED + alt = IGNORED + mousePosX = 0 + mousePosY = 0 + mousePosValid = FALSE + curveSelection = Diagram + selectionTolerance = 5 + selectedCurve = -1 + selectedSeries = -1 + selectedSeriesGlobal = -1 + selectedPoint = -1 + maskValid = FALSE + } +} +module Histogram { + internal { + frame = "541 373 88 56" + moduleGroupName = "" + windows { + window _default { + geometry = "438 386 426 310" + sizeHint = "426 310" + wasOpen = no + wasActive = no + } + } + } + fields { + instanceName = Histogram + useMask = FALSE + xRange = "Dynamic Min/Max" + maskMode = Weights + curveType = Line + curveStyle = 0 + updateMode = AutoUpdate + upToDate = TRUE + status = "Histogram(s) up-to-date" + useStepFunction = FALSE + useBinSizeOneRepresentation = TRUE + useBackgroundValue = TRUE + backgroundValue = 0 + binSize = 1 + progress = 1 + } +} +module IntervalThreshold { + internal { + frame = "513 453 128 56" + moduleGroupName = "" + windows { + window _default { + geometry = "847 159 373 367" + sizeHint = "373 367" + wasOpen = no + wasActive = no + } + } + } + fields { + instanceName = IntervalThreshold + lowerType = ImgMin + innerType = ImgOrig + upperType = ImgMin + imageMin = 0 + imageMax = 4095 + imageRange = 4095 + threshCenter = 1000 + threshWidth = 1000 + threshMin = 500 + threshMax = 1500 + lowerUserValue = 0 + innerUserValue = 0 + upperUserValue = 0 + changeMinMax = FALSE + changedMin = -100000 + changedMax = 100000 + } +} +module View2DExtensions { + internal { + frame = "645 373 136 56" + moduleGroupName = "" + } + fields { + instanceName = View2DExtensions + slicerOn = TRUE + zoomOn = TRUE + panOn = TRUE + autoCenterOn = TRUE + position = "-3.984270095825195 -7.729000091552734 32.68109893798828" + positionMode = Off + lutOn = TRUE + lutMouseOn = TRUE + lutMouseButton1 = IGNORED + lutMouseButton2 = IGNORED + lutMouseButton3 = PRESSED + lutMouseShift = RELEASED + lutMouseCtrl = RELEASED + lutRangeMin = 0 + lutRangeMax = 4095 + lutAlphaSync = TRUE + lutGreyCenter = 2437.000244 + lutGreyWidth = 3614.000244 + lutAlphaCenter = 2437.000244 + lutAlphaWidth = 3614.000244 + lutColorFactor = "1 1 1" + lutAlphaFactor = 1 + lutAutoDefault = FALSE + lutSetInputMinMax = TRUE + lutUseTraceColors = FALSE + lutEnableNegWidth = FALSE + lutSetDefaultOnce = TRUE + lutTrCol0 = "1 1 1" + lutTrCol1 = "0.5019609928131104 0.5019609928131104 0.5019609928131104" + lutTrCol2 = "0.8627449870109558 0 0.1725489944219589" + lutTrCol3 = "1 0.4627450108528137 0.4901959896087646" + lutTrCol4 = "0 0.8196079730987549 0.1607840061187744" + lutTrCol5 = "0.5607839822769165 1 0.4352940022945404" + lutTrCol6 = "0.1843139976263046 0.2392159998416901 0.9294120073318481" + lutTrCol7 = "0.4901959896087646 0.5411760210990906 1" + lutTrCol8 = "0.6313729882240295 0 0.67843097448349" + lutTrCol9 = "0.8941180109977722 0.3803919851779938 1" + lutTrColA = "0 0.6823530197143555 0.756862998008728" + lutTrColB = "0.5019609928131104 1 0.9803919792175293" + lutTrColC = "0.6156859993934631 0.6000000238418579 0.1960780024528503" + lutTrColD = "1 0.9764710068702698 0.3686270117759705" + lutTrColE = "1 1 1" + lutTrColF = "1 1 1" + annotationOn = TRUE + annoCoords = Voxel + annoCTValue = ToHounsfield + valueHighPrecision = FALSE + annotFontSize = ANNO_SIZE_AUTO + annotShowOrientation = ANNO_ORIENTATION_SIZE_WEIGHTED + annotVerticalRuler = TRUE + annotHorizontalRuler = FALSE + annotationCol = "0.8999999761581421 0.8999999761581421 0.8999999761581421" + annotationMode = ANNO_MODE_AUTO + annotShowAnnot = ANNO_SHOW_DETAILED + annotUserTopLeft = "$(PatientsName) +$(PatientID) $(PatientsSex) +$(PatientsBirthDate) +($(input00)): $(input01)" + annotUserTopRight = "$(InstitutionName) +$(ManufacturersModelName) +$(Modality)" + annotUserBottomLeft = "slice: $(slice) +Timepoint: $(timepoint) +$(sizex),$(sizey),$(sizez),$(sizec),$(sizet) +$(voxelx),$(voxely),$(voxelz) +$(SeriesDescription)" + annotUserBottomRight = "User Mode +Scan: $(AcquisitionDate) +LUT C/W: $(input03) / $(input04)" + annotShortTopLeft = "$(PatientsName) +($(input00)): + $(input01) GV" + annotShortTopRight = $(Modality) + annotShortBottomLeft = "Slice: $(slice)" + annotShortBottomRight = "LUT C/W: $(input03) / $(input04)" + annoInput03 = 2437 + annoInput04 = 3614 + annoInput05 = 2437.000244140625 + annoInput06 = 3614.000244140625 + annoInput07 = 2437.000244140625 + annoInput08 = 3614.000244140625 + annoInput09 = HU + annoMouseOn = TRUE + annoReadPixFloorPos = "32 0 31" + annoReadPixVoxelPos = "32.60504150390625 0.4033613502979279 31.5" + annoReadPixWorldPos = "32.60504150390625 0.4033613502979279 31.5" + borderOn = TRUE + borderColor = "0.8999999761581421 0.8999999761581421 0.8999999761581421" + borderWidth = 1 + borderEvaluateFocus = FALSE + borderFocusColor = "1 1 1" + borderFocusWidth = 2 + mouseGrabberMode = FALSE + } + internalFields = "" +} +module SoView2DPosition { + internal { + frame = "789 373 136 56" + moduleGroupName = "" + windows { + window _default { + geometry = "137 241 470 665" + sizeHint = "470 665" + wasOpen = no + wasActive = no + } + } + } + fields { + instanceName = SoView2DPosition + drawingOn = TRUE + editingOn = TRUE + maskValid = FALSE + fixZOn = TRUE + color = "1 1 1" + selectionTolerance = 4 + needsValidVoxel = TRUE + button1 = PRESSED + button2 = IGNORED + button3 = IGNORED + shift = IGNORED + control = IGNORED + alt = IGNORED + wantsAllEvents = FALSE + wantsKeyEvents = FALSE + wantsMouseWheelEvents = FALSE + setEventHandled = FALSE + ignoreHandledEvents = FALSE + createNewMode = FALSE + renderOnSlab = FALSE + clipToSlice = FALSE + cursorShape = UNDEFINED_CURSOR + worldPosition = "32.40083694458008 32.5 31.66596984863281" + firstSliceWorldPosition = "32.40083694458008 32.5 31.66596984863281" + drawingModel = DRAWINGMODEL_CROSSHAIRS + drawingModelSize = -1 + blendOnto = 1 + blendOutside = 0 + lineWidth = 1 + colorAxes = FALSE + sagittalColor = "1 0 0" + coronalColor = "0.1725490242242813 0.886274516582489 0.0117647061124444" + axialColor = "0.007843137718737125 0.9529411792755127 0.9686274528503418" + updateOnPress = TRUE + updateOnMotion = TRUE + updateOnRelease = FALSE + cooperative = FALSE + colorBorder = FALSE + colorBorderWidth = 2 + } +} +module SoGroup { + internal { + frame = "785 269 128 56" + moduleGroupName = "" + } + fields { + instanceName = SoGroup + } +} +module SoOrthoView2D { + internal { + frame = "941 373 120 56" + moduleGroupName = "" + windows { + window _default { + geometry = "674 230 373 633" + sizeHint = "373 633" + wasOpen = no + wasActive = no + } + } + } + fields { + instanceName = SoOrthoView2D + renderCaching = AUTO + boundingBoxCaching = AUTO + renderCulling = AUTO + pickCulling = AUTO + worldPosition = "32.40083694458008 32.5 31.66596984863281" + blendMode = BLEND_REPLACE + filterMode = FILTER_LINEAR + lutMode = LUT_BEST + slab = 1 + layoutMode = LAYOUT_CUBE_EQUAL + worldPosSticky = FALSE + snapToCenter = FALSE + drawImageData = TRUE + alphaFactor = 1 + baseColor = "1 1 1" + synchronizeZoom = TRUE + sliceZoom = 1 + minSliceZoomKeyboard = 1 + sliceOrigin1 = "0 0" + sliceOrigin2 = "0 0" + sliceOrigin3 = "0 0" + synchronizePanning = FALSE + keepSlicesInView = FALSE + viewingCenter = "-1 -1 -1" + viewingCenter1 = "32.5 32 32" + viewingCenter2 = "32 32.5 32" + viewingCenter3 = "32 32 31.5" + invertKeyPanningDirections = FALSE + extraViewSpace = TRUE + extraViewLowerLeft = "0 0.5" + extraViewUpperRight = "0.5 1" + extraViewSize = "0.6660000085830688 0.6660000085830688" + margin = "2 2" + alternCubeLayout = FALSE + cacheMode = SLICE_CACHING_OFF + timePoint = 0 + maxTimePoint = 0 + status = "Nothing active" + zoomMode = VIEW2D_AUTO_ZOOM + zoomModeParameter = 1 + sliceStep1 = 1 + sliceStep2 = 1 + sliceStep3 = 1 + numSlices1 = 1 + numSlices2 = 1 + numSlices3 = 1 + numXSlices1 = 1 + numXSlices2 = 1 + numXSlices3 = 1 + synchronizeFilterMode = TRUE + cineCenterT = 0 + cineIntervalT = 0 + cineDirection = CINE_PINGPONG + cineRepeat = CINE_ONCE + cineSpeed = 0.1000000015 + cineFullRangeT = TRUE + cineAlwaysReset = TRUE + useGlobalInputImage = TRUE + } +} +module LocalImage { + internal { + frame = "673 573 96 56" + moduleGroupName = "" + } + fields { + instanceName = LocalImage + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.1aVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" + } + internalFields = "" +} +module CombinedOrthoView2D { + internal { + frame = "585 157 160 56" + moduleGroupName = "" + windows { + window _default { + geometry = "145 324 572 489" + sizeHint = "200 200" + wasOpen = yes + wasActive = no + } + } + } + fields { + instanceName = CombinedOrthoView2D + position = TopLeft + margin = 2 + } + internalFields = "" +} +connections { + Diagram2D.inCurveList = Histogram.outputHistogramCurve + Histogram.input0 = IntervalThreshold.output0 + IntervalThreshold.input0 = LocalImage.outImage + View2DExtensions.inLUT = LocalImage.outImage + SoView2DPosition.worldPosition = SoOrthoView2D.worldPosition + SoGroup.children = "View2DExtensions.outNode SoView2DPosition.self SoOrthoView2D.self" + SoOrthoView2D.inputImage = LocalImage.outImage + SoOrthoView2D.worldPosition = SoView2DPosition.worldPosition + CombinedOrthoView2D.child0 = Diagram2D.outNode + CombinedOrthoView2D.child1 = SoGroup.self +} +networkModel = "" Added: trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3DExample.mlab =================================================================== --- trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3DExample.mlab (rev 0) +++ trunk/Community/General/Modules/Macros/CombinedOrthoView/CombinedOrthoView3DExample.mlab 2009-08-14 09:55:42 UTC (rev 184) @@ -0,0 +1,410 @@ +// MDL v1 utf8 +network { + watchlist = "" +} +module View2DExtensions { + internal { + frame = "757 373 136 56" + moduleGroupName = "" + } + fields { + instanceName = View2DExtensions + slicerOn = TRUE + zoomOn = TRUE + panOn = TRUE + autoCenterOn = TRUE + position = "-3.984270095825195 -7.729000091552734 32.68109893798828" + positionMode = Off + lutOn = TRUE + lutMouseOn = TRUE + lutMouseButton1 = IGNORED + lutMouseButton2 = IGNORED + lutMouseButton3 = PRESSED + lutMouseShift = RELEASED + lutMouseCtrl = RELEASED + lutRangeMin = 0 + lutRangeMax = 4095 + lutAlphaSync = TRUE + lutGreyCenter = 2437.000244 + lutGreyWidth = 3614.000244 + lutAlphaCenter = 2437.000244 + lutAlphaWidth = 3614.000244 + lutColorFactor = "1 1 1" + lutAlphaFactor = 1 + lutAutoDefault = FALSE + lutSetInputMinMax = TRUE + lutUseTraceColors = FALSE + lutEnableNegWidth = FALSE + lutSetDefaultOnce = TRUE + lutTrCol0 = "1 1 1" + lutTrCol1 = "0.5019609928131104 0.5019609928131104 0.5019609928131104" + lutTrCol2 = "0.8627449870109558 0 0.1725489944219589" + lutTrCol3 = "1 0.4627450108528137 0.4901959896087646" + lutTrCol4 = "0 0.8196079730987549 0.1607840061187744" + lutTrCol5 = "0.5607839822769165 1 0.4352940022945404" + lutTrCol6 = "0.1843139976263046 0.2392159998416901 0.9294120073318481" + lutTrCol7 = "0.4901959896087646 0.5411760210990906 1" + lutTrCol8 = "0.6313729882240295 0 0.67843097448349" + lutTrCol9 = "0.8941180109977722 0.3803919851779938 1" + lutTrColA = "0 0.6823530197143555 0.756862998008728" + lutTrColB = "0.5019609928131104 1 0.9803919792175293" + lutTrColC = "0.6156859993934631 0.6000000238418579 0.1960780024528503" + lutTrColD = "1 0.9764710068702698 0.3686270117759705" + lutTrColE = "1 1 1" + lutTrColF = "1 1 1" + annotationOn = TRUE + annoCoords = Voxel + annoCTValue = ToHounsfield + valueHighPrecision = FALSE + annotFontSize = ANNO_SIZE_AUTO + annotShowOrientation = ANNO_ORIENTATION_SIZE_WEIGHTED + annotVerticalRuler = TRUE + annotHorizontalRuler = FALSE + annotationCol = "0.8999999761581421 0.8999999761581421 0.8999999761581421" + annotationMode = ANNO_MODE_AUTO + annotShowAnnot = ANNO_SHOW_DETAILED + annotUserTopLeft = "$(PatientsName) +$(PatientID) $(PatientsSex) +$(PatientsBirthDate) +($(input00)): $(input01)" + annotUserTopRight = "$(InstitutionName) +$(ManufacturersModelName) +$(Modality)" + annotUserBottomLeft = "slice: $(slice) +Timepoint: $(timepoint) +$(sizex),$(sizey),$(sizez),$(sizec),$(sizet) +$(voxelx),$(voxely),$(voxelz) +$(SeriesDescription)" + annotUserBottomRight = "User Mode +Scan: $(AcquisitionDate) +LUT C/W: $(input03) / $(input04)" + annotShortTopLeft = "$(PatientsName) +($(input00)): + $(input01) GV" + annotShortTopRight = $(Modality) + annotShortBottomLeft = "Slice: $(slice)" + annotShortBottomRight = "LUT C/W: $(input03) / $(input04)" + annoInput03 = 2437 + annoInput04 = 3614 + annoInput05 = 2437.000244140625 + annoInput06 = 3614.000244140625 + annoInput07 = 2437.000244140625 + annoInput08 = 3614.000244140625 + annoInput09 = HU + annoMouseOn = TRUE + annoReadPixFloorPos = "13 1 31" + annoReadPixVoxelPos = "13.16075134277344 1.202505230903625 31.5" + annoReadPixWorldPos = "13.16075134277344 1.202505230903625 31.5" + borderOn = TRUE + borderColor = "0.8999999761581421 0.8999999761581421 0.8999999761581421" + borderWidth = 1 + borderEvaluateFocus = FALSE + borderFocusColor = "1 1 1" + borderFocusWidth = 2 + mouseGrabberMode = FALSE + } + internalFields = "" +} +module SoView2DPosition { + internal { + frame = "901 373 136 56" + moduleGroupName = "" + windows { + window _default { + geometry = "137 241 470 665" + sizeHint = "470 665" + wasOpen = no + wasActive = no + } + } + } + fields { + instanceName = SoView2DPosition + drawingOn = TRUE + editingOn = TRUE + maskValid = FALSE + fixZOn = TRUE + color = "1 1 1" + selectionTolerance = 4 + needsValidVoxel = TRUE + button1 = PRESSED + button2 = IGNORED + button3 = IGNORED + shift = IGNORED + control = IGNORED + alt = IGNORED + wantsAllEvents = FALSE + wantsKeyEvents = FALSE + wantsMouseWheelEvents = FALSE + setEventHandled = FALSE + ignoreHandledEvents = FALSE + createNewMode = FALSE + renderOnSlab = FALSE + clipToSlice = FALSE + cursorShape = UNDEFINED_CURSOR + worldPosition = "32.40083694458008 32.5 31.66596984863281" + firstSliceWorldPosition = "32.40083694458008 32.5 31.66596984863281" + drawingModel = DRAWINGMODEL_CROSSHAIRS + drawingModelSize = -1 + blendOnto = 1 + blendOutside = 0 + lineWidth = 1 + colorAxes = FALSE + sagittalColor = "1 0 0" + coronalColor = "0.1725490242242813 0.886274516582489 0.0117647061124444" + axialColor = "0.007843137718737125 0.9529411792755127 0.9686274528503418" + updateOnPress = TRUE + updateOnMotion = TRUE + updateOnRelease = FALSE + cooperative = FALSE + colorBorder = FALSE + colorBorderWidth = 2 + } +} +module SoGroup { + internal { + frame = "897 269 128 56" + moduleGroupName = "" + } + fields { + instanceName = SoGroup + } +} +module SoOrthoView2D { + internal { + frame = "1053 373 120 56" + moduleGroupName = "" + windows { + window _default { + geometry = "674 230 373 633" + sizeHint = "373 633" + wasOpen = no + wasActive = no + } + } + } + fields { + instanceName = SoOrthoView2D + renderCaching = AUTO + boundingBoxCaching = AUTO + renderCulling = AUTO + pickCulling = AUTO + worldPosition = "32.40083694458008 32.5 31.66596984863281" + blendMode = BLEND_REPLACE + filterMode = FILTER_LINEAR + lutMode = LUT_BEST + slab = 1 + layoutMode = LAYOUT_CUBE_EQUAL + worldPosSticky = FALSE + snapToCenter = FALSE + drawImageData = TRUE + alphaFactor = 1 + baseColor = "1 1 1" + synchronizeZoom = TRUE + sliceZoom = 1 + minSliceZoomKeyboard = 1 + sliceOrigin1 = "0 0" + sliceOrigin2 = "0 0" + sliceOrigin3 = "0 0" + synchronizePanning = FALSE + keepSlicesInView = FALSE + viewingCenter = "-1 -1 -1" + viewingCenter1 = "32.5 32 32" + viewingCenter2 = "32 32.5 32" + viewingCenter3 = "32 32 31.5" + invertKeyPanningDirections = FALSE + extraViewSpace = TRUE + extraViewLowerLeft = "0 0.5" + extraViewUpperRight = "0.5 1" + extraViewSize = "0.6660000085830688 0.6660000085830688" + margin = "2 2" + alternCubeLayout = FALSE + cacheMode = SLICE_CACHING_OFF + timePoint = 0 + maxTimePoint = 0 + status = "Nothing active" + zoomMode = VIEW2D_AUTO_ZOOM + zoomModeParameter = 1 + sliceStep1 = 1 + sliceStep2 = 1 + sliceStep3 = 1 + numSlices1 = 1 + numSlices2 = 1 + numSlices3 = 1 + numXSlices1 = 1 + numXSlices2 = 1 + numXSlices3 = 1 + synchronizeFilterMode = TRUE + cineCenterT = 0 + cineIntervalT = 0 + cineDirection = CINE_PINGPONG + cineRepeat = CINE_ONCE + cineSpeed = 0.1000000015 + cineFullRangeT = TRUE + cineAlwaysReset = TRUE + useGlobalInputImage = TRUE + } +} +module SoWEMRenderer { + internal { + frame = "641 269 128 56" + moduleGroupName = "" + } + fields { + instanceName = SoWEMRenderer + renderCaching = AUTO + boundingBoxCaching = AUTO + renderCulling = AUTO + pickCulling = AUTO + autoApply = TRUE + autoUpdate = TRUE + autoClear = TRUE + useHighlightSelected = FALSE + usePolygonOffset = TRUE + useShapeHints = TRUE + allowHits = TRUE + parameterOverwriteMode = OVERWRITE_MODE_ALL + overwriteColorMode = FALSE + overwriteFaceParameters = FALSE + overwriteEdgeParameters = FALSE + overwriteNodeParameters = FALSE + overwriteBoundingBoxParameters = FALSE + colorMode = WEM_COLOR_GENERAL + drawFaces = TRUE + faceDiffuseColor = "0.792156994342804 0.792156994342804 0.792156994342804" + useFaceAmbientColor = TRUE + faceAmbientColor = "0.2666670083999634 0.2666670083999634 0.2666670083999634" + useFaceSpecularColor = TRUE + faceSpecularColor = "0.06666699796915054 0.06666699796915054 0.06666699796915054" + drawEdges = FALSE + edgeColor = "0 0 0" + drawNodes = FALSE + nodeColor = "1 1 1" + drawBoundingBoxes = FALSE + boundingBoxColor = "1 1 1" + drawFaceNormals = FALSE + drawNodeNormals = FALSE + faceNormalColor = "1 1 1" + nodeNormalColor = "1 1 1" + faceNormalScaling = 1 + nodeNormalScaling = 1 + faceAlphaValue = 1 + faceShininessValue = 1 + lineWidth = 1 + pointSize = 1 + useEdgeColoringMode = FALSE + nodeRenderingMode = WEM_NODE_RENDERING_NORMAL + boundingBoxMode = WEM_BOUNDING_BOX_AXIS_ALIGNED + primitiveValueLists = LUT + selectedPrimitiveValueList = LUT + primitiveValueListValid = FALSE + selectedTab = 0 + } +} +module LocalWEMLoad { + internal { + frame = "637 373 120 56" + moduleGroupName = "" + } + fields { + instanceName = LocalWEMLoad + name = $(DemoDataPath)/venus.off + trueName = "C:/Program Files (x86)/MeVisLab2.1aVC8-64/Packages/MeVisLab/Resources/DemoData/venus.off" + id = 0 + mirrorFaces = FALSE + triangulateFaces = FALSE + triangulationMode = Strip + generateEdges = TRUE + autoUpdate = TRUE + autoApply = TRUE + removePreviousWEMs = TRUE + label = "" + description = "" + show = TRUE + editable = TRUE + colorMode = "General " + drawFaces = TRUE + useFaceAmbientColor = TRUE + faceAmbientColor = "0.266667008399963 0.266667008399963 0.266667008399963" + useFaceDiffuseColor = TRUE + faceDiffuseColor = "0.792156994342804 0.792156994342804 0.792156994342804" + useFaceSpecularColor = TRUE + faceSpecularColor = "0.0666669979691505 0.0666669979691505 0.0666669979691505" + faceAlphaValue = 1 + faceShininessValue = 1 + drawFaceNormals = FALSE + faceNormalsColor = "1 1 1" + faceNormalsScale = 1 + drawEdges = FALSE + edgeColor = "0 0 0" + usePolygonOffset = FALSE + lineWidth = 1 + useEdgeColoringMode = FALSE + drawNodes = FALSE + nodeColor = "1 1 1" + drawNodeNormals = FALSE + nodeNormalsColor = "1 1 1" + nodeNormalsScale = 1 + pointSize = 1 + nodeRenderingMode = Normal + drawBoundingBoxes = FALSE + boundingBoxColor = "1 1 1" + boundingBoxMode = "Axis Aligned" + isProcessing = FALSE + elapsedTime = 0.01499999966 + selectedTab = 0 + } + internalFields = "" +} +module LocalImage { + internal { + frame = "913 509 96 56" + moduleGroupName = "" + } + fields { + instanceName = LocalImage + name = $(DemoDataPath)/Bone.tiff + trueName = "C:/Program Files (x86)/MeVisLab2.1aVC8-64/Packages/MeVisLab/Resources/DemoData/Bone.tiff" + autoLoad = TRUE + status = "File open" + } + internalFields = "" +} +module CombinedOrthoView3D { + internal { + frame = "761 157 160 56" + moduleGroupName = "" + windows { + window _default { + geometry = "435 305 573 492" + sizeHint = "200 200" + wasOpen = yes + wasActive = no + } + window _automatic { + geometry = "513 429 260 224" + sizeHint = "260 224" + wasOpen = no + wasActive = no + } + } + } + fields { + instanceName = CombinedOrthoView3D + automaticViewAll = TRUE + position = TopLeft + margin = 2 + } + internalFields = "" +} +connections { + View2DExtensions.inLUT = LocalImage.outImage + SoView2DPosition.worldPosition = SoOrthoView2D.worldPosition + SoGroup.children = "View2DExtensions.outNode SoView2DPosition.self SoOrthoView2D.self" + SoOrthoView2D.inputImage = LocalImage.outImage + SoOrthoView2D.worldPosition = SoView2DPosition.worldPosition + SoWEMRenderer.inWEM = LocalWEMLoad.outWEM + CombinedOrthoView3D.child0 = SoWEMRenderer.self + CombinedOrthoView3D.child1 = SoGroup.self +} +networkModel = "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bar...@us...> - 2009-08-14 09:15:58
|
Revision: 183 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=183&view=rev Author: bartdedobbelaer Date: 2009-08-14 09:15:44 +0000 (Fri, 14 Aug 2009) Log Message: ----------- - Added class to send HTML mails through SMTP server Added Paths: ----------- trunk/Community/General/Modules/Scripts/mail.py Added: trunk/Community/General/Modules/Scripts/mail.py =================================================================== --- trunk/Community/General/Modules/Scripts/mail.py (rev 0) +++ trunk/Community/General/Modules/Scripts/mail.py 2009-08-14 09:15:44 UTC (rev 183) @@ -0,0 +1,92 @@ + +import smtplib +import MimeWriter +import mimetools +import cStringIO +import re + +#--------------------------------------------------------------------------------------------------------------------------------------- +class HTMLMail: + _smtpserver = "" + _source = "" + _destination = "" + _subject = "" + _html = "" + _ascii = "" + + #--------------------------------------------------------------------------------------------------------------------------------------- + def __init__(self,smtpserver="",source="",destination="",subject="",html="",ascii=""): + self.setSTMPServer(smtpserver) + self.setSource(source) + self.setDestination(destination) + self.setSubject(subject) + self.setMessage(html, ascii) + + #--------------------------------------------------------------------------------------------------------------------------------------- + def setSMTPServer(self,smtpserver): + self._smtpserver = smtpserver + + #--------------------------------------------------------------------------------------------------------------------------------------- + def setSource(self,source): + self._source = source + + #--------------------------------------------------------------------------------------------------------------------------------------- + def setDestination(self,destination): + self._destination = destination + + #--------------------------------------------------------------------------------------------------------------------------------------- + def setSubject(self,subject): + self._subject = subject + + #--------------------------------------------------------------------------------------------------------------------------------------- + def setMessage(self,html,ascii=""): + self._html = html + self._ascii = ascii + + #--------------------------------------------------------------------------------------------------------------------------------------- + def send(self): + if not self._smptserver or not self._source or not self._destination or not self._subject or not self._html: + return + + msg = self._createHTMLMail(self._source,self._destination,self._subject,self._html,self._ascii) + server = smtplib.SMTP(self._smtpserver) + _from = re.findall('\<(.*?)\>',self._source) + if _from: + server.sendmail(_from[0],self._destination,msg) + else: + server.sendmail(self._source,self._destination,msg) + server.quit() + + #--------------------------------------------------------------------------------------------------------------------------------------- + def _createHTMLMail(self,sender,recipient,subject,html,text): + out = cStringIO.StringIO() + + writer = MimeWriter.MimeWriter(out) + + writer.addheader("From",sender) + writer.addheader("To",recipient) + writer.addheader("Subject",subject) + writer.addheader("MIME-Version","1.0") + writer.startmultipartbody("alternative") + writer.flushheaders() + + if text: + textin = cStringIO.StringIO(text) + subpart = writer.nextpart() + subpart.addheader("Content-Transfer-Encoding","quoted-printable") + pout = subpart.startbody("text/plain",[("charset", "us-ascii")]) + mimetools.encode(textin, pout,"quoted-printable") + textin.close() + + htmlin = cStringIO.StringIO(html) + subpart = writer.nextpart() + subpart.addheader("Content-Transfer-Encoding","quoted-printable") + pout = subpart.startbody("text/html",[("charset", "us-ascii")]) + mimetools.encode(htmlin, pout,"quoted-printable") + htmlin.close() + + writer.lastpart() + msg = out.getvalue() + out.close() + + return msg \ 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...> - 2009-08-14 09:00:07
|
Revision: 182 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=182&view=rev Author: bartdedobbelaer Date: 2009-08-14 08:59:57 +0000 (Fri, 14 Aug 2009) Log Message: ----------- - Various bug fixes Modified Paths: -------------- trunk/Community/General/Modules/Scripts/pgsql.py Modified: trunk/Community/General/Modules/Scripts/pgsql.py =================================================================== --- trunk/Community/General/Modules/Scripts/pgsql.py 2009-08-12 09:52:22 UTC (rev 181) +++ trunk/Community/General/Modules/Scripts/pgsql.py 2009-08-14 08:59:57 UTC (rev 182) @@ -62,8 +62,9 @@ for i in range(len(values)): query.bindValue(i,values[i]) - stored = query.execQuery() - ID = query.lastInsertId() + query.execQuery() + currval = self._pgsql.query("SELECT currval('" + table + "_id_seq')") + ID = int(currval[0]['currval']) self._pgsql.removeQuery(query) return ID @@ -78,8 +79,8 @@ ID = 0 result = self.query("SELECT id FROM " + table + " WHERE " + where) - if len(results): - ID = int(results[0]['id']) + if len(result): + ID = int(result[0]['id']) else: ID = self.store(table,fields,values) @@ -90,6 +91,10 @@ self._pgsql.query(query) #--------------------------------------------------------------------------------------------------------------------------------------- + def commit(self): + self._pgsql.commit() + + #--------------------------------------------------------------------------------------------------------------------------------------- def fetchLatest(self,table,field,limit=50): results = self._pgsql.query("SELECT * FROM " + table + " ORDER BY " + field + " DESC LIMIT 0," + `limit`) @@ -123,7 +128,7 @@ return results #--------------------------------------------------------------------------------------------------------------------------------------- - def searchMultiple(self,searchString,tables,condition,searchFields,color=""): + def searchMultiple(self,searchString,tables,condition,searchFields,color="",aliases=""): if not self._pgsql: return [] @@ -138,7 +143,10 @@ where.append("(" + " OR ".join(subwhere) + ")") - query = "SELECT * FROM " + tables + " WHERE " + condition + " AND " + " AND ".join(where) + query = "SELECT *" + aliases + " FROM " + tables + " WHERE " + if condition: + query += condition + " AND " + query += " AND ".join(where) return self._search(query,searchWords,color) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rha...@us...> - 2009-08-12 09:52:32
|
Revision: 181 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=181&view=rev Author: rhameeteman Date: 2009-08-12 09:52:22 +0000 (Wed, 12 Aug 2009) Log Message: ----------- KH. * Added the keyword 'trace' and seeAlso = FieldTracer, because I couldn't find the module. Modified Paths: -------------- trunk/Community/General/Modules/Macros/NotificationAnalyzer/NotificationAnalyzer.def Modified: trunk/Community/General/Modules/Macros/NotificationAnalyzer/NotificationAnalyzer.def =================================================================== --- trunk/Community/General/Modules/Macros/NotificationAnalyzer/NotificationAnalyzer.def 2009-08-05 10:50:44 UTC (rev 180) +++ trunk/Community/General/Modules/Macros/NotificationAnalyzer/NotificationAnalyzer.def 2009-08-12 09:52:22 UTC (rev 181) @@ -23,8 +23,9 @@ author = "Lars Bornemann" status = "test" comment = "Listen to all connected fields and count notifications for each" - keywords = "performance field notification debug" + keywords = "performance field notification debug trace" scriptOnly = yes + seeAlso = FieldTracer externalDefinition = "$(LOCAL)/NotificationAnalyzer.script" exampleNetwork = "$(LOCAL)/networks/NotficationAnalyzerExample.mlab" } // MacroModule StringListEntrytoString This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bro...@us...> - 2009-08-05 10:50:51
|
Revision: 180 http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=180&view=rev Author: broersen Date: 2009-08-05 10:50:44 +0000 (Wed, 05 Aug 2009) Log Message: ----------- ENH: Added conversion to load correct MATLAB data types from different MeVisLab data types ENH: Improvements to showing/hiding a MATLAB session window Modified Paths: -------------- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp Modified: trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp =================================================================== --- trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2009-07-29 06:02:47 UTC (rev 179) +++ trunk/Community/General/Sources/ML/MLMatlabScriptWrapper/mlMatlabScriptWrapper.cpp 2009-08-05 10:50:44 UTC (rev 180) @@ -76,8 +76,6 @@ //! Where will matlab script be dumped. (_matlabScriptPathFld = fields->addString("matlabScriptPath"))->setStringValue(""); - //! Show the Matlab session window. - (_showSessionWindowFld = fields->addBool("showSessionWindow"))->setBoolValue(false); //! Set input and output data names used in matlab. (_inDataNameFld[0] = fields->addString("inDataName0"))->setStringValue("Input0"); @@ -119,7 +117,6 @@ handleNotificationOn(); m_pEngine = engOpen(NULL); - engSetVisible(m_pEngine,false); if ( !_checkMatlabIsStarted() ) { @@ -136,6 +133,14 @@ std::cerr << " PATH set to the above. Edit your 'current executable' settings accordingly." << std::endl; std::cerr << " DYLD_LIBRARY_PATH has to be extended to contain" << std::endl; std::cerr << " /Applications/MATLAB_R2007b/bin/maci:/Applications/MATLAB_R2007b/sys/os/maci" << std::endl; + + (_showSessionWindowFld = fields->addBool("showSessionWindow"))->setBoolValue(false); + _statusFld->setStringValue("Cannot find Matlab engine!"); + } else { + //! Show the Matlab session window. + bool vis; + engGetVisible(m_pEngine, &vis); + (_showSessionWindowFld = fields->addBool("showSessionWindow"))->setBoolValue(vis); } } @@ -165,13 +170,18 @@ if(!_checkMatlabIsStarted()) { // Start Matlab if it's not started. m_pEngine = engOpen(NULL); - engSetVisible(m_pEngine,_showSessionWindowFld->getBoolValue()); + // If Matlab engine is started, make session window (in)visible + if(_checkMatlabIsStarted()) { + engSetVisible(m_pEngine,_showSessionWindowFld->getBoolValue()); + } else { + _statusFld->setStringValue("Cannot find Matlab engine!"); + } } else { std::cout << "Matlab is already started"; } } - if(field == _showSessionWindowFld) { + if( (field == _showSessionWindowFld) && _checkMatlabIsStarted() ) { if(_showSessionWindowFld->isOn()) { engSetVisible(m_pEngine, true); } else { @@ -308,8 +318,8 @@ // Set output image datatype. switch (mxGetClassID(m_pImage)) { case mxDOUBLE_CLASS: - getOutImg(outIndex)->setDataType(MLdoubleType); - break; + getOutImg(outIndex)->setDataType(MLdoubleType); + break; case mxSINGLE_CLASS: getOutImg(outIndex)->setDataType(MLfloatType); break; @@ -366,12 +376,17 @@ } //---------------------------------------------------------------------------------- -//! Request input image in fixed datatype. +//! Request input image in basic datatype. //---------------------------------------------------------------------------------- -void MatlabScriptWrapper::calcInSubImageProps (int /*inIndex*/, InSubImageProps &props, int /*outIndex*/) +void MatlabScriptWrapper::calcInSubImageProps (int inIndex, InSubImageProps &props, int /*outIndex*/) { - // Request input image in double type. - props.inSubImgDType = MLdoubleType; + PagedImg *inImg = getNonDummyUpdatedInImg(inIndex); + if(inImg != NULL) { + props.inSubImgDType = inImg->getDataType(); + } else { + // Request input image in double type. + props.inSubImgDType = MLdoubleType; + } } //---------------------------------------------------------------------------------- @@ -405,46 +420,42 @@ if ( (m_pImage != NULL) ) { // Copy different types of images from Matlab. + MLPhysicalDataType outputClass; switch (mxGetClassID(m_pImage)) { - case mxDOUBLE_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLdoubleType, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; - case mxSINGLE_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLfloatType, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; - case mxINT8_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLint8Type, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; - case mxUINT8_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLuint8Type, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; - case mxINT16_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLint16Type, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; - case mxUINT16_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLuint16Type, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; - case mxINT32_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLint32Type, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; - case mxUINT32_CLASS: { - SubImg subImgBuf(outSubImg->getBox(), MLuint32Type, mxGetPr(m_pImage)); - outSubImg->copySubImage(subImgBuf); - } break; + case mxDOUBLE_CLASS: + outputClass = MLdoubleType; + break; + case mxSINGLE_CLASS: + outputClass = MLfloatType; + break; + case mxINT8_CLASS: + outputClass = MLint8Type; + break; + case mxUINT8_CLASS: + outputClass = MLuint8Type; + break; + case mxINT16_CLASS: + outputClass = MLint16Type; + break; + case mxUINT16_CLASS: + outputClass = MLuint16Type; + break; + case mxINT32_CLASS: + outputClass = MLint32Type; + break; + case mxUINT32_CLASS: + outputClass = MLuint32Type; + break; case mxINT64_CLASS: // Matlab does not support basic operations on this type - //SubImg subImgBuf(outSubImg->getBox(), MLint64Type, mxGetPr(m_pImage)); - //outSubImg->copySubImage(subImgBuf); - //} break; + //outputClass = MLint64Type; + //break; default: + outputClass = ML_BAD_DATA_TYPE; std::cerr << "calcOutSubImage(): Output type from Matlab not supported!" << std::endl << std::flush; } + SubImg subImgBuf(outSubImg->getBox(), outputClass, mxGetPr(m_pImage)); + outSubImg->copySubImage(subImgBuf); + mxDestroyArray(m_pImage); m_pImage = NULL; } else @@ -472,7 +483,7 @@ // Get a valid input if possible. Dummy input is considered invalid. PagedImg *inImg = getUpdatedInImg(i); - if(!(inImg == DummyOp::getGlobalInstance().getOutImg(i))) + if(!(inImg == DummyOp::getGlobalInstance().getOutImg(0))) { // If we get an invalid pointer to the image we abort. if (!inImg) { @@ -492,7 +503,7 @@ getTile(getInOp(i),getInOpIndex(i), SubImgBox(Vector(0, 0, 0, 0, 0, 0), Vector(imgSize.x-1, imgSize.y-1, imgSize.z-1,imgSize.c-1, imgSize.t-1, imgSize.u-1)), - MLdoubleType, + inImg->getDataType(), &data, ScaleShiftData(1,0)); @@ -508,18 +519,64 @@ // Set matlab image extent. const mwSize insizesArray[6] = {imgSize.x, imgSize.y, imgSize.z, imgSize.c, imgSize.t, imgSize.u}; + + // Copy different types of images from MeVisLab. + mxClassID inputClass; + int elementSize; + switch (inImg->getDataType()) { + case MLdoubleType: + inputClass = mxDOUBLE_CLASS; + elementSize = sizeof(double); + break; + case MLfloatType: + inputClass = mxSINGLE_CLASS; + elementSize = sizeof(real32_T); + break; + case MLint8Type: + inputClass = mxINT8_CLASS; + elementSize = sizeof(int8_T); + break; + case MLuint8Type: + inputClass = mxUINT8_CLASS; + elementSize = sizeof(uint8_T); + break; + case MLint16Type: + inputClass = mxINT16_CLASS; + elementSize = sizeof(int16_T); + break; + case MLuint16Type: + inputClass = mxUINT16_CLASS; + elementSize = sizeof(uint16_T); + break; + case MLint32Type: + inputClass = mxINT32_CLASS; + elementSize = sizeof(int32_T); + break; + case MLuint32Type: + inputClass = mxUINT32_CLASS; + elementSize = sizeof(uint32_T); + break; + case MLint64Type: + inputClass = mxINT64_CLASS; + elementSize = sizeof(int64_T); + break; + default: + inputClass = mxDOUBLE_CLASS; + elementSize = sizeof(double); + std::cerr << "_copyInputImageDataToMatlab(): Output type from MeVisLab not supported!" << std::endl << std::flush; + } // Create numeric array - mxArray *m_X = mxCreateNumericArray(6, insizesArray, mxDOUBLE_CLASS, mxREAL); + mxArray *m_pImage = mxCreateNumericArray(6, insizesArray, inputClass, mxREAL); // Copy data to matlab array. - memcpy((void*)mxGetPr(m_X), data, inDataSize*sizeof(double)); + memcpy((void*)mxGetPr(m_pImage), data, inDataSize*elementSize); // Get input names from gui. std::string inputName = _inDataNameFld[i]->getStringValue(); // Write data to matlab. - engPutVariable(m_pEngine, inputName.c_str(), m_X); + engPutVariable(m_pEngine, inputName.c_str(), m_pImage); - mxDestroyArray(m_X); + mxDestroyArray(m_pImage); m_pImage = NULL; // Free allocated memory for holding a slice. freeTile(data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |