From d07ffae073c2cb7ab9fa6e4a3c84ed364c21c2f9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 12 Jun 2014 09:45:36 +0000
Subject: [PATCH] fine-tuning
---
contrib/mobile/drawContext.cpp | 10 ++++++----
contrib/mobile/drawContext.h | 2 +-
.../iOS/Onelab/en.lproj/iPadStoryboard.storyboard | 4 ++--
.../Onelab/en.lproj/iPhoneiPodStoryboard.storyboard | 10 +++++-----
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/contrib/mobile/drawContext.cpp b/contrib/mobile/drawContext.cpp
index 3060eb964a..ea0f008196 100644
--- a/contrib/mobile/drawContext.cpp
+++ b/contrib/mobile/drawContext.cpp
@@ -523,12 +523,16 @@ void drawContext::drawPost()
}
}
-void drawContext::drawAxes(float x0, float y0, float z0, float h)
+void drawContext::drawAxes()
{
glLineWidth(1.);
glPushMatrix();
glLoadIdentity();
+ GLfloat h = std::max(_top - _bottom, _right - _left) / 25. ;
+ GLfloat x0 = _right - 1.8 * h;
+ GLfloat y0 = _bottom + 1.5 * h;
+
GLfloat xx = h * _rotatef[0];
GLfloat xy = h * _rotatef[1];
GLfloat yx = h * _rotatef[4];
@@ -641,9 +645,7 @@ void drawContext::drawView()
glDisable(GL_DEPTH_TEST);
drawScale();
checkGlError("Draw scales");
- drawAxes(_right - (_top - _bottom)/15.0,
- _bottom + (_top - _bottom)/15.0,
- 0, (_top - _bottom)/25.);
+ drawAxes();
checkGlError("Draw axes");
}
diff --git a/contrib/mobile/drawContext.h b/contrib/mobile/drawContext.h
index f68d3b3e82..ac7076d86c 100644
--- a/contrib/mobile/drawContext.h
+++ b/contrib/mobile/drawContext.h
@@ -37,7 +37,7 @@ public:
float getScale(int i) {if(i>=0 && i<3) return _scale[i]; return 0;}
void initView(int w, int h);
void drawView();
- void drawAxes(float x0=0., float y0=0., float z0=0., float h=0.5);
+ void drawAxes();
void drawGeom();
void drawMesh();
void drawPost();
diff --git a/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard b/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
index 2e285f3bae..ec0a5a515a 100644
--- a/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
+++ b/contrib/mobile/iOS/Onelab/en.lproj/iPadStoryboard.storyboard
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="dwa-Pq-2vA">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13D65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="dwa-Pq-2vA">
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
@@ -47,7 +47,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</activityIndicatorView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="top" lineBreakMode="middleTruncation" id="GRU-nz-BNs">
- <rect key="frame" x="638" y="79" width="45" height="45"/>
+ <rect key="frame" x="645" y="83" width="40" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<state key="normal" image="icon_rotate.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard b/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard
index 3a69def712..783f0d342c 100644
--- a/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard
+++ b/contrib/mobile/iOS/Onelab/en.lproj/iPhoneiPodStoryboard.storyboard
@@ -60,11 +60,11 @@
</constraints>
</activityIndicatorView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="top" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ct3-iA-CZQ">
- <rect key="frame" x="273" y="76" width="35" height="35"/>
+ <rect key="frame" x="280" y="74" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<constraints>
- <constraint firstAttribute="height" constant="35" id="59F-eB-IWj"/>
- <constraint firstAttribute="width" constant="35" id="Cor-0l-wdz"/>
+ <constraint firstAttribute="height" constant="30" id="59F-eB-IWj"/>
+ <constraint firstAttribute="width" constant="30" id="Cor-0l-wdz"/>
</constraints>
<state key="normal" image="icon_rotate.png">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -79,12 +79,12 @@
<constraints>
<constraint firstItem="yT7-IR-qUJ" firstAttribute="bottom" secondItem="Fuh-zG-zVR" secondAttribute="bottom" id="AP1-zU-goA"/>
<constraint firstAttribute="bottom" secondItem="Fuh-zG-zVR" secondAttribute="bottom" constant="20" symbolic="YES" id="J47-7T-QdC"/>
- <constraint firstAttribute="trailing" secondItem="Ct3-iA-CZQ" secondAttribute="trailing" constant="12" id="Nep-AD-3aJ"/>
+ <constraint firstAttribute="trailing" secondItem="Ct3-iA-CZQ" secondAttribute="trailing" constant="10" id="Nep-AD-3aJ"/>
<constraint firstAttribute="trailing" secondItem="yT7-IR-qUJ" secondAttribute="trailing" constant="20" symbolic="YES" id="P96-El-NrK"/>
<constraint firstItem="yT7-IR-qUJ" firstAttribute="leading" secondItem="Fuh-zG-zVR" secondAttribute="trailing" constant="8" symbolic="YES" id="oc4-6x-CF7"/>
<constraint firstItem="Fuh-zG-zVR" firstAttribute="top" secondItem="yT7-IR-qUJ" secondAttribute="top" id="qEd-Tx-ibj"/>
<constraint firstItem="Fuh-zG-zVR" firstAttribute="leading" secondItem="zrj-Dd-WPc" secondAttribute="leading" constant="20" symbolic="YES" id="qfh-y2-BuW"/>
- <constraint firstItem="Ct3-iA-CZQ" firstAttribute="top" secondItem="B2T-ui-MHS" secondAttribute="bottom" constant="12" id="uxn-cS-R2c"/>
+ <constraint firstItem="Ct3-iA-CZQ" firstAttribute="top" secondItem="B2T-ui-MHS" secondAttribute="bottom" constant="10" id="uxn-cS-R2c"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="7R3-zZ-cpa" appends="YES" id="K8X-lL-YUb"/>
--
GitLab