Skip to content

Commit

Permalink
1.5 Beta: Analyze imported areas, fall in condition computation changed.
Browse files Browse the repository at this point in the history
  • Loading branch information
bendermh committed Jun 1, 2019
1 parent 27d8636 commit c111f6b
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 110 deletions.
88 changes: 45 additions & 43 deletions Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,32 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" id="Ceo-xn-EKd">
<rect key="frame" x="156" y="13" width="169" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="push" title="Analyze data..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="23e-5q-MJl">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="analizeData:" target="viT-we-6ee" id="rMZ-WW-Fmm"/>
</connections>
</button>
<box verticalHuggingPriority="750" boxType="separator" id="S65-Bf-HOX">
<rect key="frame" x="20" y="206" width="440" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<box verticalHuggingPriority="750" boxType="separator" id="HCw-Cx-y35">
<rect key="frame" x="20" y="59" width="440" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="izD-cE-HmC">
<rect key="frame" x="412" y="213" width="48" height="48"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Background" id="1lh-Mv-qZT"/>
</imageView>
<textField verticalHuggingPriority="750" id="LaV-ch-lPL">
<rect key="frame" x="125" y="151" width="81" height="27"/>
<rect key="frame" x="120" y="151" width="81" height="27"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="adF-aQ-f5r">
<font key="font" metaFont="system" size="16"/>
Expand All @@ -812,7 +836,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="DUJ-N5-r7L">
<rect key="frame" x="125" y="91" width="81" height="27"/>
<rect key="frame" x="339" y="150" width="81" height="27"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="DEw-rM-rR0">
<font key="font" metaFont="system" size="16"/>
Expand All @@ -821,27 +845,16 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="4La-hF-Sj2">
<rect key="frame" x="342" y="151" width="81" height="27"/>
<rect key="frame" x="120" y="92" width="81" height="27"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="NWh-mV-6BX">
<font key="font" metaFont="system" size="16"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" id="Ceo-xn-EKd">
<rect key="frame" x="156" y="13" width="169" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="push" title="Analyze data..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="23e-5q-MJl">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="analizeData:" target="viT-we-6ee" id="rMZ-WW-Fmm"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="u5e-2v-9pt">
<rect key="frame" x="55" y="156" width="58" height="17"/>
<rect key="frame" x="58" y="156" width="58" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="AREA 1" id="Mxe-km-hJJ">
<font key="font" metaFont="system"/>
Expand All @@ -850,7 +863,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="p40-UK-HAq">
<rect key="frame" x="55" y="96" width="58" height="17"/>
<rect key="frame" x="275" y="155" width="58" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="AREA 2" id="01N-GF-a0l">
<font key="font" metaFont="system"/>
Expand All @@ -859,7 +872,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="las-yP-Tc4">
<rect key="frame" x="272" y="156" width="58" height="17"/>
<rect key="frame" x="58" y="97" width="58" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="AREA 3" id="6EZ-Br-ghk">
<font key="font" metaFont="system"/>
Expand All @@ -868,52 +881,41 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="1Vt-zZ-KYK">
<rect key="frame" x="272" y="96" width="58" height="17"/>
<rect key="frame" x="275" y="96" width="58" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="AREA 4" id="vvW-Cl-UXG">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" id="S65-Bf-HOX">
<rect key="frame" x="20" y="206" width="440" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<box verticalHuggingPriority="750" boxType="separator" id="HCw-Cx-y35">
<rect key="frame" x="20" y="59" width="440" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="P86-MO-MXB">
<rect key="frame" x="18" y="223" width="444" height="27"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="INPUT RECORDED DATA" id="9nl-48-Fct">
<font key="font" metaFont="system" size="22"/>
<color key="textColor" red="0.0" green="0.25098040700000002" blue="0.50196081400000003" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="izD-cE-HmC">
<rect key="frame" x="412" y="213" width="48" height="48"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Background" id="1lh-Mv-qZT"/>
</imageView>
<textField verticalHuggingPriority="750" id="KOd-Gw-t2p">
<rect key="frame" x="342" y="91" width="81" height="27"/>
<rect key="frame" x="339" y="91" width="81" height="27"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="7QQ-0Z-1Mr">
<font key="font" metaFont="system" size="16"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="RMP-uE-fXq">
<rect key="frame" x="18" y="228" width="444" height="22"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="INPUT RECORDED DATA" id="Eqi-zF-clh">
<font key="font" metaFont="system" size="18"/>
<color key="textColor" red="0.12245623022317886" green="0.32341295480728149" blue="0.55409568548202515" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
</view>
<connections>
<outlet property="area1Field" destination="LaV-ch-lPL" id="pi3-HH-aEs"/>
<outlet property="area2Field" destination="DUJ-N5-r7L" id="99z-Xg-nwW"/>
<outlet property="area3Field" destination="4La-hF-Sj2" id="Pq5-Et-Cod"/>
<outlet property="area4Field" destination="KOd-Gw-t2p" id="1Ny-xy-g0t"/>
<outlet property="botonAnalisis" destination="Ceo-xn-EKd" id="2ff-bq-YDe"/>
<outlet property="textoSuperior" destination="RMP-uE-fXq" id="nMh-Au-ydV"/>
</connections>
</viewController>
<customObject id="Xzt-aV-GOn" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
Expand Down Expand Up @@ -1203,9 +1205,9 @@
</textFieldCell>
</textField>
<textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="jHo-5h-czD">
<rect key="frame" x="180" y="505" width="386" height="17"/>
<rect key="frame" x="137" y="505" width="470" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="DATA IS NOT FROM REAL POSTUROGRAPHY" id="9pZ-ce-I1D">
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="ANALIZED DATA IS NOT FROM REAL POSTUROGRAPHY" id="9pZ-ce-I1D">
<font key="font" metaFont="system"/>
<color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand Down
Loading

0 comments on commit c111f6b

Please sign in to comment.