復活

ICTTourismKiko · Dec 2, 2015 · 3f0429f · 3f0429f
1 parent 1c1edd1
commit 3f0429f
Show file tree

Hide file tree

Showing 101 changed files with 614 additions and 561 deletions.
diff --git a/DB.xcodeproj/project.pbxproj b/DB.xcodeproj/project.pbxproj
diff --git a/DB.xcodeproj/project.xcworkspace/xcuserdata/Kenta.xcuserdatad/UserInterfaceState.xcuserstate b/DB.xcodeproj/project.xcworkspace/xcuserdata/Kenta.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...odeproj/project.xcworkspace/xcuserdata/Toshiki.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/Toshiki.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...odeproj/project.xcworkspace/xcuserdata/codepro.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/codepro.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/DB/5200574633_baefe45590_b.jpg b/DB/5200574633_baefe45590_b.jpg
diff --git a/DB/AppDelegate.swift b/DB/AppDelegate.swift
@@ -21,6 +21,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var view_pic: UIImage!
 
+    var pic_segmented = 0
+
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
         // Override point for customization after application launch.
         return true

diff --git a/DB/Assets.xcassets/AppIcon.appiconset/appicon-Small@2x.png b/DB/Assets.xcassets/AppIcon.appiconset/appicon-Small@2x.png
diff --git a/DB/Assets.xcassets/AppIcon.appiconset/appicon-Small@3x.png b/DB/Assets.xcassets/AppIcon.appiconset/appicon-Small@3x.png
diff --git a/DB/Base.lproj/Main.storyboard b/DB/Base.lproj/Main.storyboard
diff --git a/DB/CreatePicController.swift b/DB/CreatePicController.swift
@@ -19,64 +19,22 @@ class CreatePicController: UIViewController {
     @IBOutlet weak var pic5: UIImageView!
     @IBOutlet weak var pic6: UIImageView!
     @IBOutlet weak var pic7: UIImageView!
+    @IBOutlet weak var pic8: UIImageView!
 
-    @IBOutlet weak var textback1: UIImageView!
-    @IBOutlet weak var textback2: UIImageView!
-    @IBOutlet weak var textback3: UIImageView!
-    @IBOutlet weak var textback4: UIImageView!
-    @IBOutlet weak var textback5: UIImageView!
-    @IBOutlet weak var textback6: UIImageView!
-    @IBOutlet weak var textback7: UIImageView!
-
-    @IBOutlet weak var title1: UILabel!
-    @IBOutlet weak var title2: UILabel!
-    @IBOutlet weak var title3: UILabel!
-    @IBOutlet weak var title4: UILabel!
-    @IBOutlet weak var title5: UILabel!
-    @IBOutlet weak var title6: UILabel!
-    @IBOutlet weak var title7: UILabel!
-
-    @IBOutlet weak var text1: UILabel!
-    @IBOutlet weak var text4: UILabel!
-    @IBOutlet weak var text5: UILabel!
-    @IBOutlet weak var text7: UILabel!
-
     let appDelegate:AppDelegate = UIApplication.sharedApplication().delegate as! AppDelegate
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
         backimage.image = UIImage(named: "haikei.png")
 
-        textback1.image = UIImage(named: "b300.png")
-        textback2.image = UIImage(named: "b300.png")
-        textback3.image = UIImage(named: "b300.png")
-        textback4.image = UIImage(named: "b300.png")
-        textback5.image = UIImage(named: "b300.png")
-        textback6.image = UIImage(named: "b300.png")
-        textback7.image = UIImage(named: "b300.png")
-
-        title1.text=DB().getCard(appDelegate.cardID[1]).cardText?.title
-        title2.text=DB().getCard(appDelegate.cardID[2]).cardText?.title
-        title3.text=DB().getCard(appDelegate.cardID[3]).cardText?.title
-        title4.text=DB().getCard(appDelegate.cardID[4]).cardText?.title
-        title5.text=DB().getCard(appDelegate.cardID[5]).cardText?.title
-        title6.text=DB().getCard(appDelegate.cardID[6]).cardText?.title
-        title7.text=DB().getCard(appDelegate.cardID[7]).cardText?.title
-
-        text1.text=DB().getCard(appDelegate.cardID[1]).cardText?.text
-        text4.text=DB().getCard(appDelegate.cardID[4]).cardText?.text
-        text5.text=DB().getCard(appDelegate.cardID[5]).cardText?.text
-        text7.text=DB().getCard(appDelegate.cardID[7]).cardText?.text
-
-
         pic1.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[1]).photo?.photoData)!)
         pic2.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[2]).photo?.photoData)!)
         pic3.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[3]).photo?.photoData)!)
         pic4.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[4]).photo?.photoData)!)
         pic5.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[5]).photo?.photoData)!)
         pic6.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[6]).photo?.photoData)!)
         pic7.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[7]).photo?.photoData)!)
+        pic8.image=PhotoController().NSSImage((DB().getCard(appDelegate.cardID[8]).photo?.photoData)!)
 
         appDelegate.view_pic = getUIImageFromUIView(background_view)
 

diff --git a/DB/Info.plist b/DB/Info.plist
@@ -33,7 +33,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/DB/PrintPreview1Controller.swift b/DB/PrintPreview1Controller.swift
diff --git a/DB/PrintPreview2Controller.swift b/DB/PrintPreview2Controller.swift
diff --git a/DB/PrintPreviewController.swift b/DB/PrintPreviewController.swift
diff --git a/DB/SelectPhoto1Controller.swift b/DB/SelectPhoto1Controller.swift
@@ -14,6 +14,7 @@ class SelectPhoto1Controller: UIViewController {
     @IBOutlet weak var photo2: UIImageView!
     @IBOutlet weak var photo3: UIImageView!
     @IBOutlet weak var navigation: UINavigationBar!
+    @IBOutlet weak var barItem1: UIBarButtonItem!
 
     let appDelegate:AppDelegate = UIApplication.sharedApplication().delegate as! AppDelegate
 
@@ -25,8 +26,8 @@ class SelectPhoto1Controller: UIViewController {
         navigation.tintColor = UIColor.whiteColor()
 
 
-        NSTimer.scheduledTimerWithTimeInterval(0.5,target:self,selector:Selector("pic_show"),
-            userInfo: nil, repeats: true);
+        NSTimer.scheduledTimerWithTimeInterval(0.01,target:self,selector:Selector("pic_show"),
+            userInfo: nil, repeats: false);
 
         // Do any additional setup after loading the view.
     }
@@ -35,10 +36,6 @@ class SelectPhoto1Controller: UIViewController {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
-    @IBAction func next(sender: AnyObject) {
-        let targetViewController = self.storyboard!.instantiateViewControllerWithIdentifier( "target2" )
-        self.presentViewController( targetViewController, animated: true, completion: nil)
-    }
     @IBAction func photo1_select(sender: AnyObject) {
         appDelegate.picID=1
     }

diff --git a/DB/SelectPhoto2Controller.swift b/DB/SelectPhoto2Controller.swift
@@ -14,6 +14,7 @@ class SelectPhoto2Controller: UIViewController {
     @IBOutlet weak var photo5: UIImageView!
     @IBOutlet weak var photo6: UIImageView!
     @IBOutlet weak var photo7: UIImageView!
+    @IBOutlet weak var photo8: UIImageView!
     @IBOutlet weak var navigation: UINavigationBar!
 
     let appDelegate:AppDelegate = UIApplication.sharedApplication().delegate as! AppDelegate
@@ -24,8 +25,8 @@ class SelectPhoto2Controller: UIViewController {
         let navBarImage = UIImage(named: "bar6.png") as UIImage?
         self.navigation.setBackgroundImage(navBarImage, forBarMetrics:. Default)
 
-        NSTimer.scheduledTimerWithTimeInterval(0.5,target:self,selector:Selector("pic_show"),
-            userInfo: nil, repeats: true);
+        NSTimer.scheduledTimerWithTimeInterval(0.01,target:self,selector:Selector("pic_show"),
+            userInfo: nil, repeats: false);
 
         // Do any additional setup after loading the view.
     }
@@ -46,12 +47,10 @@ class SelectPhoto2Controller: UIViewController {
     @IBAction func pic7_select(sender: AnyObject) {
         appDelegate.picID=7
     }
-
-
-    @IBAction func back(sender: AnyObject) {
-//        let targetViewController = self.storyboard!.instantiateViewControllerWithIdentifier( "target1" )
-//        self.presentViewController( targetViewController, animated: true, completion: nil)
+    @IBAction func pic8_select(sender: AnyObject) {
+        appDelegate.picID=8
     }
+
     func pic_show(){
 
         if(appDelegate.cardID[4] == 0){
@@ -75,10 +74,16 @@ class SelectPhoto2Controller: UIViewController {
         }else{
             photo7.image = PhotoController().NSSImage((DB().getCard(appDelegate.cardID[7]).photo?.photoData)!)
         }
+        if(appDelegate.cardID[8] == 0){
+            photo8.image = UIImage(named: "noimage.jpg")
+        }else{
+            photo8.image = PhotoController().NSSImage((DB().getCard(appDelegate.cardID[8]).photo?.photoData)!)
+        }
+
     }
 
     @IBAction func finish(sender: AnyObject) {
-        if((appDelegate.cardID[1]==0)||(appDelegate.cardID[2]==0)||(appDelegate.cardID[3]==0)||(appDelegate.cardID[4]==0)||(appDelegate.cardID[5]==0)||(appDelegate.cardID[6]==0)||(appDelegate.cardID[7]==0)
+        if((appDelegate.cardID[1]==0)||(appDelegate.cardID[2]==0)||(appDelegate.cardID[3]==0)||(appDelegate.cardID[4]==0)||(appDelegate.cardID[5]==0)||(appDelegate.cardID[6]==0)||(appDelegate.cardID[7]==0)||(appDelegate.cardID[8]==0)
             ){
                 let myAlert: UIAlertController = UIAlertController(title: "エラー", message: "画像を全て選んでください", preferredStyle: .Alert)
                 // OKのアクションを作成する.

diff --git a/DB/album.swift b/DB/album.swift
diff --git a/DB/album_userphoto.swift b/DB/album_userphoto.swift
@@ -0,0 +1,52 @@
+//
+//  album.swift
+//  DB
+//
+//  Created by 岩見建汰 on 2015/11/19.
+//  Copyright © 2015年 project03A. All rights reserved.
+//
+
+import UIKit
+
+class album_userphoto: UIViewController {
+
+
+    @IBOutlet weak var navigationbar: UINavigationBar!
+
+    let appDelegate:AppDelegate = UIApplication.sharedApplication().delegate as! AppDelegate
+    var backbutton = UIButton()
+
+
+    @IBOutlet weak var segmented: UISegmentedControl!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        let navBarImage = UIImage(named: "bar6.png") as UIImage?
+        self.navigationbar.setBackgroundImage(navBarImage, forBarMetrics:. Default)
+        self.view.backgroundColor = UIColor(patternImage: UIImage(named: "haikei.png")!)
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+
+
+    @IBAction func segmentedchanged(sender: AnyObject) {
+        switch sender.selectedSegmentIndex{
+        case 0: //撮影写真
+            appDelegate.pic_segmented = 0
+
+        case 1: //サンプル写真
+            appDelegate.pic_segmented = 1
+            let targetViewController = self.storyboard!.instantiateViewControllerWithIdentifier("album_defaultphoto")
+            self.presentViewController( targetViewController, animated: false, completion: nil)
+            self.segmented.selectedSegmentIndex = 0         //選択を戻す
+        default:
+            break
+        }
+    }
+    @IBAction func backbutton(sender: AnyObject) {
+        self.dismissViewControllerAnimated(true, completion: nil)    }
+}
diff --git a/DB/b300.png b/DB/b300.png
diff --git a/DB/back.png b/DB/back.png
diff --git a/DB/back1.png b/DB/back1.png
diff --git a/DB/background.png b/DB/background.png
diff --git a/DB/bar6.png b/DB/bar6.png
diff --git a/DB/camera1.png b/DB/camera1.png
diff --git a/DB/camera3-3.png b/DB/camera3-3.png
diff --git a/DB/cardList2.swift b/DB/cardList2.swift
@@ -64,9 +64,6 @@ class cardList2: UIViewController, UITableViewDelegate, UITableViewDataSource{
         cell.setCell(cards[indexPath.row])
         return cell
     }
-    @IBAction func photo_select(sender: AnyObject) {
-        self.dismissViewControllerAnimated(true, completion: nil)
-    }
 
 }
 
diff --git a/DB/flag_on.png b/DB/flag_on.png
diff --git a/DB/haikei.png b/DB/haikei.png
diff --git a/DB/hurikaeri.png b/DB/hurikaeri.png
diff --git a/DB/kanko.png b/DB/kanko.png
diff --git a/DB/leaf.jpg b/DB/leaf.jpg
diff --git a/DB/map.jpg b/DB/map.jpg
diff --git a/DB/map2.png b/DB/map2.png
diff --git a/DB/next.png b/DB/next.png
diff --git a/DB/noimage.jpg b/DB/noimage.jpg