1.5 Pre-Release: External data import, fall computation changed

Author: bendermh

AppDelegate.h

@@ -27,6 +27,10 @@ BOOL reconectarOn;
 - (IBAction)losmedio:(id)sender;
 - (IBAction)losflojo:(id)sender;
 - (IBAction)itemexit:(id)sender;
+- (IBAction)externalData:(id)sender;
+
+@property NSWindowController *myWindowControllerA;
+
 
 @end
 

AppDelegate.m

@@ -15,6 +15,9 @@ @interface AppDelegate ()
 
 @implementation AppDelegate
 
+@synthesize myWindowControllerA;
+
+
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     // Insert code here to initialize your application
 
@@ -144,6 +147,13 @@ - (IBAction)itemexit:(id)sender{
      object:nil];
 }
 
+- (IBAction)externalData:(id)sender {
+    
+    NSStoryboard *storyBoard = [NSStoryboard storyboardWithName:@"Main" bundle:nil]; // get a reference to the storyboard
+    myWindowControllerA = [storyBoard instantiateControllerWithIdentifier:@"SextaVentana"]; // instantiate your window controller
+    [myWindowControllerA showWindow:self];
+}
+
 
 
 @end

Base.lproj/Main.storyboard

@@ -11,6 +11,7 @@
 @interface FivethViewController : NSViewController
 {
     float A1,A2,A3,A4;
+    bool isRealPostur;
 }
 @property NSMutableArray *datos;
 @property NSMutableArray *datosCondicion1;

FivethViewController.h

@@ -25,6 +25,7 @@ @interface FivethViewController ()
 @property (weak) IBOutlet NSView *areaReport;
 @property (weak) IBOutlet NSTextField *globalScoreValue;
 @property (weak) IBOutlet NSTextField *betaInfo;
+@property (weak) IBOutlet NSTextField *externalData;
 
 @end
 
@@ -203,10 +204,10 @@ -(NSArray *)getScores:(float)area1 :(float)area2 :(float)area3 :(float)area4{
     float scoreTres = ((179.33-(area3-19.18))/(179.33));
     float scoreCuatro = ((743.22-(area4-39.11))/(743.22));
     //Falls & Negative Counting
-    if (_buttonCondition1.state == TRUE) {scoreUno = 0;}
-    if (_buttonCondition2.state == TRUE) {scoreDos = 0;}
-    if (_buttonCondition3.state == TRUE) {scoreTres = 0;}
-    if (_buttonCondition4.state == TRUE) {scoreCuatro = 0;}
+    if (_buttonCondition1.state == TRUE) {scoreUno = -4;}
+    if (_buttonCondition2.state == TRUE) {scoreDos = -4;}
+    if (_buttonCondition3.state == TRUE) {scoreTres = -4;}
+    if (_buttonCondition4.state == TRUE) {scoreCuatro = -4;}
     //Global score
     float ScoreGlobal = ((scoreUno+scoreDos+scoreTres+scoreCuatro)/4);
     float ScoreVestibular = scoreCuatro;
@@ -452,7 +453,11 @@ -(float)limiteSomatosensorial:(int)ageGroup :(int)heightGroup{
 }
 
 -(void)analiza:(NSNotification*)notificacion{
-    
+    NSString *isReal = [notificacion.userInfo objectForKey:@"isReal"];
+    if ([isReal  isEqual: @"true"]){
+    // se ejecuta si viene de posturografía
+    isRealPostur = true;
+        [self.externalData setHidden:true];
     //Metodo para cargar los datos en esta clase
     datos = (NSMutableArray *)notificacion.object;
     datosCondicion1 = [NSMutableArray array];
@@ -514,6 +519,17 @@ -(void)analiza:(NSNotification*)notificacion{
     if ([datosCondicion4 count]){
         [self AreaCuatro];
     }
+    }
+    else {
+        isRealPostur = false;
+        [self.externalData setHidden:false];
+        NSArray *importedAreas = (NSArray *)notificacion.object;
+        A1 = [[importedAreas objectAtIndex:0]floatValue];
+        A2 = [[importedAreas objectAtIndex:1]floatValue];
+        A3 = [[importedAreas objectAtIndex:2]floatValue];
+        A4 = [[importedAreas objectAtIndex:3]floatValue];
+    }
+    
     if(A1+A2+A3+A4>0){
         NSLog(@"Areas: %0.2f %0.2f %0.2f %0.2f", A1, A2, A3, A4);
     }

FivethViewController.m

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4</string>
+	<string>1.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>03</string>
+	<string>01</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.medical</string>
 	<key>LSMinimumSystemVersion</key>

Info.plist

@@ -31,6 +31,8 @@
 		CFC285BF1C1116DA0017601E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CFC285BE1C1116DA0017601E /* QuartzCore.framework */; };
 		CFCE00C31F5D414D00195E89 /* FivethWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CFCE00C21F5D414D00195E89 /* FivethWindowController.m */; };
 		CFCE00D41F5D417700195E89 /* FivethViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CFCE00D21F5D417700195E89 /* FivethViewController.m */; };
+		CFFA5D4922A1C7D30040CDB9 /* sixthWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CFFA5D4822A1C7D30040CDB9 /* sixthWindowController.m */; };
+		CFFA5D4C22A1C8340040CDB9 /* sixthViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CFFA5D4B22A1C8340040CDB9 /* sixthViewController.m */; };
 		CFFDE6CE1C0B822500E08C64 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CFFDE6CB1C0B822500E08C64 /* AppDelegate.m */; };
 		CFFDE6CF1C0B822500E08C64 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CFFDE6CD1C0B822500E08C64 /* ViewController.m */; };
 /* End PBXBuildFile section */
@@ -153,6 +155,10 @@
 		CFCE00C21F5D414D00195E89 /* FivethWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FivethWindowController.m; sourceTree = "<group>"; };
 		CFCE00D11F5D417700195E89 /* FivethViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FivethViewController.h; sourceTree = "<group>"; };
 		CFCE00D21F5D417700195E89 /* FivethViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FivethViewController.m; sourceTree = "<group>"; };
+		CFFA5D4722A1C7D30040CDB9 /* sixthWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sixthWindowController.h; sourceTree = "<group>"; };
+		CFFA5D4822A1C7D30040CDB9 /* sixthWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = sixthWindowController.m; sourceTree = "<group>"; };
+		CFFA5D4A22A1C8340040CDB9 /* sixthViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sixthViewController.h; sourceTree = "<group>"; };
+		CFFA5D4B22A1C8340040CDB9 /* sixthViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = sixthViewController.m; sourceTree = "<group>"; };
 		CFFDE6CA1C0B822500E08C64 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		CFFDE6CB1C0B822500E08C64 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		CFFDE6CC1C0B822500E08C64 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
@@ -303,6 +309,8 @@
 				CF4173531C10FE0100A27AB0 /* ThirdViewController.m */,
 				CF4173551C10FE2900A27AB0 /* FourthViewController.h */,
 				CF4173561C10FE2900A27AB0 /* FourthViewController.m */,
+				CFFA5D4A22A1C8340040CDB9 /* sixthViewController.h */,
+				CFFA5D4B22A1C8340040CDB9 /* sixthViewController.m */,
 			);
 			name = ViewControllers;
 			sourceTree = "<group>";
@@ -318,6 +326,8 @@
 				CF41734B1C10FD9800A27AB0 /* ThirdWindowController.m */,
 				CF41734F1C10FDC300A27AB0 /* FourthWindowController.h */,
 				CF4173501C10FDC300A27AB0 /* FourthWindowController.m */,
+				CFFA5D4722A1C7D30040CDB9 /* sixthWindowController.h */,
+				CFFA5D4822A1C7D30040CDB9 /* sixthWindowController.m */,
 			);
 			name = Windows;
 			sourceTree = "<group>";
@@ -477,8 +487,10 @@
 			files = (
 				CF41733E1C10F9EE00A27AB0 /* SecondViewController.m in Sources */,
 				CF4173511C10FDC300A27AB0 /* FourthWindowController.m in Sources */,
+				CFFA5D4C22A1C8340040CDB9 /* sixthViewController.m in Sources */,
 				CF41734D1C10FD9800A27AB0 /* ThirdWindowController.m in Sources */,
 				CF4173481C10FB9500A27AB0 /* SecondWindowController.m in Sources */,
+				CFFA5D4922A1C7D30040CDB9 /* sixthWindowController.m in Sources */,
 				CFFDE6CE1C0B822500E08C64 /* AppDelegate.m in Sources */,
 				CF4173571C10FE2900A27AB0 /* FourthViewController.m in Sources */,
 				8D11072D0486CEB800E47090 /* main.m in Sources */,

RombergLab.xcodeproj/project.pbxproj

@@ -1169,10 +1169,11 @@ - (IBAction)verInforme:(id)sender {
     NSStoryboard *storyBoard = [NSStoryboard storyboardWithName:@"Main" bundle:nil]; // get a reference to the storyboard
     myWindowController4 = [storyBoard instantiateControllerWithIdentifier:@"QuintaVentana"]; // instantiate your window controller
     [myWindowController4 showWindow:self];
-    
+    NSDictionary *isRealPosturography = @{@"isReal":@"true"};
     [[NSNotificationCenter defaultCenter]
      postNotificationName:@"InformePosturografia"
-     object:datos];
+     object:datos
+     userInfo:isRealPosturography];
 }
 
 - (IBAction)guardarfoto:(id)sender {

RombergLab.xcodeproj/project.xcworkspace/xcuserdata/Jorge.xcuserdatad/UserInterfaceState.xcuserstate

@@ -496,6 +496,8 @@
 
 "sJg-tA-W02.title" = "Somático:";
 
+"jHo-5h-czD.title" = "LOS DATOS ANALIZADOS NO SON REALES";
+
 /* Class = "NSMenuItem"; title = "About RombergLab"; ObjectID = "5kV-Vb-QxS"; */
 "Wfz-p6-NsX.title" = "Estudios Publicados";
 
@@ -505,11 +507,8 @@
 /* Class = "NSMenuItem"; title = "About RombergLab"; ObjectID = "5kV-Vb-QxS"; */
 "vk6-eG-mIm.title" = "Normalización de puntuaciones";
 
+"P86-MO-MXB.title" = "INTRODUZCA DATOS OBTENIDOS";
 
+"Ceo-xn-EKd.title" = "Analizar datos...";
 
-
-
-
-
-
-
+"buf-yF-xVf.title" = "Analizar datos previos...";

ThirdViewController.m

@@ -0,0 +1,20 @@
+//
+//  sixthViewController.h
+//  RombergLab
+//
+//  Created by Jorge on 31/05/2019.
+//  Copyright © 2019 ARK. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface sixthViewController : NSViewController
+
+@property NSArray *areas;
+@property NSWindowController *myWindowController6;
+
+@end
+
+NS_ASSUME_NONNULL_END

es.lproj/Main.strings

@@ -0,0 +1,52 @@
+//
+//  sixthViewController.m
+//  RombergLab
+//
+//  Created by Jorge on 31/05/2019.
+//  Copyright © 2019 ARK. All rights reserved.
+//
+
+#import "sixthViewController.h"
+
+@interface sixthViewController ()
+@property (weak) IBOutlet NSTextField *area1Field;
+@property (weak) IBOutlet NSTextField *area2Field;
+@property (weak) IBOutlet NSTextField *area3Field;
+@property (weak) IBOutlet NSTextField *area4Field;
+
+@end
+
+@implementation sixthViewController
+@synthesize myWindowController6;
+@synthesize areas;
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do view setup here.
+}
+- (IBAction)analizeData:(id)sender {
+    
+    //get data
+    float area1 = [self.area1Field.stringValue floatValue];
+    float area2 = [self.area2Field.stringValue floatValue];
+    float area3 = [self.area3Field.stringValue floatValue];
+    float area4 = [self.area4Field.stringValue floatValue];
+    
+    //validation
+    if (area1 > 0 && area2 > 0 && area3 > 0 && area4 > 0) {
+        if (area1 < 1500 && area2 < 1500 && area3 < 1500 && area4 < 1500) {
+            areas = [NSArray arrayWithObjects:[NSNumber numberWithFloat:area1],[NSNumber numberWithFloat:area2],[NSNumber numberWithFloat:area3],[NSNumber numberWithFloat:area4], nil];
+            NSStoryboard *storyBoard = [NSStoryboard storyboardWithName:@"Main" bundle:nil]; // get a reference to the storyboard
+            myWindowController6 = [storyBoard instantiateControllerWithIdentifier:@"QuintaVentana"]; // instantiate your window controller
+            [myWindowController6 showWindow:self];
+            NSDictionary *isRealPosturography = @{@"isReal":@"false"};
+            [[NSNotificationCenter defaultCenter]
+             postNotificationName:@"InformePosturografia"
+             object:areas
+             userInfo:isRealPosturography];
+        }
+    }
+    
+}
+
+@end

sixthViewController.h

@@ -0,0 +1,19 @@
+//
+//  sixthWindowController.h
+//  RombergLab
+//
+//  Created by Jorge on 31/05/2019.
+//  Copyright © 2019 ARK. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface sixthWindowController : NSWindowController
+
+@property (weak) IBOutlet NSWindow *sextaVentana;
+
+@end
+
+NS_ASSUME_NONNULL_END

sixthViewController.m

@@ -0,0 +1,33 @@
+//
+//  sixthWindowController.m
+//  RombergLab
+//
+//  Created by Jorge on 31/05/2019.
+//  Copyright © 2019 ARK. All rights reserved.
+//
+
+#import "sixthWindowController.h"
+
+@interface sixthWindowController ()
+
+@end
+
+@implementation sixthWindowController
+@synthesize sextaVentana;
+
+- (void)windowDidLoad {
+    [super windowDidLoad];
+    
+    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+    
+    NSString *userLocale = [[NSLocale currentLocale] localeIdentifier];
+    NSString *userLanguage = [userLocale substringToIndex:2];
+    if([userLanguage isEqualToString:@"es"]){
+        [sextaVentana setTitle:@"Anlálisis externo"];
+    }
+    else {
+        [sextaVentana setTitle:@"External analysis"];
+    }
+}
+
+@end