Skip to content

Commit

Permalink
HSS 1.1.4: resolve case when folder description is <null> instead of …
Browse files Browse the repository at this point in the history
…empty string.
  • Loading branch information
b-deville committed Aug 15, 2013
1 parent e277fac commit 01874c7
Show file tree
Hide file tree
Showing 140 changed files with 4,849 additions and 97 deletions.
Binary file modified DicomUnEnhancer/.DS_Store
Binary file not shown.
42 changes: 17 additions & 25 deletions HSS/HSS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,11 @@
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
599BEEFB1429C47600B45236 /* Copy Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
);
name = "Copy Frameworks";
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>"; };
089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
59F3430E14448535004904DE /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = "../../../osirix-trunk/build/Development/OsiriXAPI.framework"; sourceTree = "<group>"; };
59F3430E14448535004904DE /* OsiriXAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OsiriXAPI.framework; path = ../../osirix/build/Development/OsiriXAPI.framework; sourceTree = "<group>"; };
7110084314BB489D003F0C67 /* HSSMedcaseCreation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSSMedcaseCreation.h; path = Sources/HSSMedcaseCreation.h; sourceTree = "<group>"; };
7110084414BB489D003F0C67 /* HSSMedcaseCreation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HSSMedcaseCreation.m; path = Sources/HSSMedcaseCreation.m; sourceTree = "<group>"; };
711FBBA614B5EE6500802A87 /* HSSAPISession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSSAPISession.h; path = Sources/HSSAPISession.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -243,7 +230,6 @@
buildPhases = (
8D5B49AD048680CD000E48DA /* Headers */,
8D5B49AF048680CD000E48DA /* Resources */,
599BEEFB1429C47600B45236 /* Copy Frameworks */,
8D5B49B1048680CD000E48DA /* Sources */,
8D5B49B3048680CD000E48DA /* Frameworks */,
8D5B49B5048680CD000E48DA /* Rez */,
Expand Down Expand Up @@ -357,10 +343,10 @@
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
FRAMEWORK_SEARCH_PATHS = (
"../../../osirix-trunk/build/Development",
"$(inherited)",
"\"$(SRCROOT)/../../_Frameworks_and_Libraries\"",
"\"$(SRCROOT)/../../HUG Framework/build/Development\"",
"\"$(SRCROOT)\"",
../../osirix/build/Development,
"\"$(SRCROOT)../../osirix/build/Development\"",
);
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_TRIGRAPHS = NO;
Expand All @@ -374,7 +360,7 @@
INSTALL_PATH = "@executable_path/../Plug-ins";
LIBRARY_SEARCH_PATHS = "";
LIBRARY_STYLE = Bundle;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"-undefined",
Expand All @@ -383,7 +369,7 @@
OTHER_REZFLAGS = "";
PRODUCT_NAME = HSS;
SECTORDER_FLAGS = "";
USER_HEADER_SEARCH_PATHS = "../../../osirix-trunk/Binaries/dcmtk-source/dcmimgle ../../../osirix-trunk/Binaries/dcmtk-source/config ../../../osirix-trunk/Binaries/dcmtk-source/ofstd ../../../osirix-trunk/Binaries/dcmtk-source/dcmdata";
USER_HEADER_SEARCH_PATHS = "../../../osirix/Binaries/dcmtk-source/dcmimgle ../../../osirix/Binaries/dcmtk-source/config ../../../osirix/Binaries/dcmtk-source/ofstd ../../../osirix/Binaries/dcmtk-source/dcmdata";
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
Expand All @@ -399,10 +385,10 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"../../../osirix-trunk/build/Development",
"$(inherited)",
"\"$(SRCROOT)/../../_Frameworks_and_Libraries\"",
"\"$(SRCROOT)/../../HUG Framework/build/Development\"",
"\"$(SRCROOT)\"",
../../osirix/build/Development,
"\"$(SRCROOT)../../osirix/build/Development\"",
);
GCC_ENABLE_TRIGRAPHS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -413,7 +399,7 @@
INSTALL_PATH = "@executable_path/../Plug-ins";
LIBRARY_SEARCH_PATHS = "";
LIBRARY_STYLE = Bundle;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"-undefined",
Expand All @@ -422,7 +408,7 @@
OTHER_REZFLAGS = "";
PRODUCT_NAME = HSS;
SECTORDER_FLAGS = "";
USER_HEADER_SEARCH_PATHS = "../../../osirix-trunk/Binaries/dcmtk-source/dcmimgle ../../../osirix-trunk/Binaries/dcmtk-source/config ../../../osirix-trunk/Binaries/dcmtk-source/ofstd ../../../osirix-trunk/Binaries/dcmtk-source/dcmdata";
USER_HEADER_SEARCH_PATHS = "../../../osirix/Binaries/dcmtk-source/dcmimgle ../../../osirix/Binaries/dcmtk-source/config ../../../osirix/Binaries/dcmtk-source/ofstd ../../../osirix/Binaries/dcmtk-source/dcmdata";
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
Expand All @@ -437,6 +423,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = NO;
SDKROOT = macosx10.7;
};
name = Development;
Expand All @@ -445,6 +434,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = NO;
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = NO;
SDKROOT = macosx10.7;
};
name = Deployment;
Expand Down
2 changes: 1 addition & 1 deletion HSS/HSS.xcodeproj/xcshareddata/xcschemes/HSS.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<PathRunnable
FilePath = "/Users/ale/Work/Repositories/osirix-trunk/build/Development/OsiriX.app">
FilePath = "/Users/bd/Work/Repositories/osirix/build/Development/OsiriX.app">
</PathRunnable>
<MacroExpansion>
<BuildableReference
Expand Down
1 change: 1 addition & 0 deletions HSS/HUG.framework/HUG
1 change: 1 addition & 0 deletions HSS/HUG.framework/Headers
1 change: 1 addition & 0 deletions HSS/HUG.framework/Resources
Binary file added HSS/HUG.framework/Versions/A/CardTool
Binary file not shown.
Binary file added HSS/HUG.framework/Versions/A/HUG
Binary file not shown.
20 changes: 20 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/All.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#ifndef __HUG
#define __HUG

#include <HUG/AuthenticationWindowController.h>
#include <HUG/Constants.h>
#include <HUG/CStoreSecurityAccess.h>
#include <HUG/Enterprise.h>
#include <HUG/HUG.h>
#include <HUG/HUGHTTPClient.h>
#include <HUG/HUGSOAPWebServiceClient.h>
#include <HUG/HUGXMLWebServiceClient.h>
#include <HUG/LogEntry.h>
#include <HUG/Logger.h>
#include <HUG/UsernameWindowController.h>
#include <HUG/Utils.h>
#include <HUG/WSGeneratedObj.h>
#include <HUG/XMLServices.h>
#include <HUG/XMLServicesWebServiceClient.h>

#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//
// AuthenticationWindowController.h
// HUG Framework
//
// Created by Alessandro Volz on 26.05.11.
// Copyright 2011 OsiriX Team. All rights reserved.
//

#import <Cocoa/Cocoa.h>


@interface AuthenticationWindowController : NSWindowController {
IBOutlet NSTextField* _infoLabel;
IBOutlet NSButton* _okButton;
IBOutlet NSButton* _checkHybridButton;
IBOutlet NSTextField* _loginField;
IBOutlet NSTextField* _passwordField;
IBOutlet NSTextField* _messageLabel;
NSTimer* _timer;
NSLock* _timerLock;
BOOL _requestHybrid;
NSString* _certificate;
NSString* _password;
NSModalSession _modalSession;
}

@property(readonly,retain) NSString* certificate;
@property(readonly,retain) NSString* password;

-(NSInteger)runModal __deprecated;
-(NSInteger)runModalOnWindow:(NSWindow*)onwindow __deprecated;

-(void)beginSheetOnWindow:(NSWindow*)parentWindow callbackTarget:(id)target selector:(SEL)sel context:(void*)context;

-(IBAction)cancelAction:(id)sender;
-(IBAction)okAction:(id)sender;
-(IBAction)checkHybridAction:(id)sender;

-(IBAction)updateOkButton:(id)sender;

-(void)invalidate;

@end
17 changes: 17 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/CStoreSecurityAccess.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// CStoreSecurityAccess.h
// Logger
//
// Created by Arnaud Garcia on 28.09.05.
// Copyright 2005 __MyCompanyName__. All rights reserved.
//

#import "XMLServicesWebServiceClient.h"


@interface CStoreSecurityAccess : XMLServicesWebServiceClient {
}

+(BOOL)isStoreAuthorizedForHost:(NSString*)host;

@end
17 changes: 17 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/Constants.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Constants.h
* Compacs
*
* Created by Alessandro Volz on 12.10.09.
* Copyright 2009 HUG. All rights reserved.
*
*/

//#define PathToCardUser @"/tmp/osirix_card_user"
#define PathToXploreUser @"/tmp/osirix_user"

extern NSString* const HUGModeFilePath;

#define HUGTrickMask (NSCommandKeyMask|NSAlternateKeyMask)
#define HUGTrick (([[NSApp currentEvent] modifierFlags]&HUGTrickMask)==HUGTrickMask)

18 changes: 18 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/Enterprise.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// Enterprise.h
// HUG Framework
//
// Created by Alessandro Volz on 21.12.11.
// Copyright 2011 OsiriX Team. All rights reserved.
//

#import <Cocoa/Cocoa.h>

@interface Enterprise : NSObject

+(NSString*)Name; // the enterprise's name, @"Apple"
+(NSString*)Username; // the current user's username (could be the OSX session username if LDAP is used, or extracted from some smartcard, or anything)
+(NSString*)StoredPasswordForUsername:(NSString*)username; // the passed username's password, if it was recently entered
+(void)StorePassword:(NSString*)password forUsername:(NSString*)username;

@end
48 changes: 48 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/HUG.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// HUG.h
// HUG Framework
//
// Created by Alessandro Volz on 10.12.09.
// Copyright 2009 OsiriX Team. All rights reserved.
//

#import <Cocoa/Cocoa.h>

#define HUGDevelopmentMode @"DEVE"
#define HUGTestMode @"TEST"
#define HUGFormationMode @"FORM"
#define HUGProductionMode @"PROD"


@interface HUG : NSObject {
}

+(NSString*)master;
+(NSString*)recommendedUsername __deprecated; // le concept "utilisateur recommandé" est éliminé

+(NSArray*)modes;
+(NSString*)mode;
+(void)setMode:(NSString*)mode;

+(NSString*)hostname;
+(NSString*)hostname:(NSArray**)rAddresses;
+(NSString*)blockForHostname:(NSArray**)rAddresses forTimeInterval:(NSTimeInterval)seconds;

+(NSString*)username;
+(NSString*)modalUsername;
+(NSString*)modalUsernameOnWindow:(NSWindow*)window;

+(NSString*)passwordForUser:(NSString*)user; // les mdp peuvent être stockés sur le disque dur pour faciliter la vie du programmeur

+(NSString*)certificate;
+(NSString*)modalCertificate __deprecated;
+(NSString*)modalCertificateOnWindow:(NSWindow*)window __deprecated;
+(void)startConditionalCertificateSheetOnWindow:(NSWindow*)window callbackTarget:(id)target selector:(SEL)sel context:(void*)context;

+(void)setCertificate:(NSString*)certificate __deprecated;
+(void)setCertificate:(NSString*)certificate password:(NSString*)password forUser:(NSString*)username;
//+(void)invalidateCertificate;

+(void)checkMasterUserAgain;

@end
20 changes: 20 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/HUGHTTPClient.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// HTTPClient.h
// HUG Framework
//
// Created by Alessandro Volz on 20.10.09.
// Copyright 2009 HUG. All rights reserved.
//

#import "XMLServicesWebServiceClient.h"

//extern NSString* ReplaceDomain;


@interface HUGHTTPClient : XMLServicesWebServiceClient {
}

+(HUGHTTPClient*)sharedInstanceForIdentifier:(NSString*)identifier mode:(NSString*)mode;
-(NSData*)get:(id)path;

@end
17 changes: 17 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/HUGSOAPWebServiceClient.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// HUGSOAPWebServiceClient.h
// HUG Framework
//
// Created by Alessandro Volz on 19.03.2011.
// Copyright 2011 HUG. All rights reserved.
//

#import "XMLServicesWebServiceClient.h"


@interface HUGSOAPWebServiceClient : XMLServicesWebServiceClient {
}

-(id)execute:(NSString*)methodName withParameterNamesAndValues: firstName, ...;

@end
19 changes: 19 additions & 0 deletions HSS/HUG.framework/Versions/A/Headers/HUGXMLWebServiceClient.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// HUGXMLWebServiceClient.h
// HUG Framework
//
// Created by Alessandro Volz on 15.10.09.
// Copyright 2009 HUG. All rights reserved.
//

#import "XMLServicesWebServiceClient.h"


@interface HUGXMLWebServiceClient : XMLServicesWebServiceClient {
}

-(NSXMLNode*)execute:(NSString*)serviceId withBody:(id)body;
-(NSXMLNode*)execute:(NSString*)serviceId subservice:(NSString*)subserviceId withBody:(id)body;
-(NSXMLNode*)execute:(NSString*)serviceId subservice:(NSString*)subserviceId session:(NSString*)sessionId withBody:(id)body;

@end
Loading

0 comments on commit 01874c7

Please sign in to comment.