From c0e5a31151dcdbf2b08707fba9008d003d87cd4f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 28 Apr 2015 19:09:09 -0400
Subject: upgrade ionicons

---
 views/controls/builder/settings.ejs | 2 +-
 views/controls/builder/toolbar.ejs  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'views/controls/builder')

diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs
index aae67d0..f7642ae 100644
--- a/views/controls/builder/settings.ejs
+++ b/views/controls/builder/settings.ejs
@@ -4,7 +4,7 @@
 
 	<div class="setting">
 		<a href="#" id="startpoint">
-			<span class="ion-ios7-navigate-outline"></span>
+			<span class="ion-ios-navigate-outline"></span>
 			<span id="startText">Select Startpoint</span>
 			<span id="moveText">Move to Desired Point</span></a>
 	</div>
diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs
index 8b2e9b8..ad51f0e 100644
--- a/views/controls/builder/toolbar.ejs
+++ b/views/controls/builder/toolbar.ejs
@@ -2,7 +2,7 @@
 	<span
 		data-role='toggle-map-view'
 		data-info="toggle map view"
-		class="ion-ios7-photos-outline"></span>
+		class="ion-ios-photos-outline"></span>
 <!--
 	<span
 		data-role='create-mode'
@@ -20,7 +20,7 @@
 	<span
 		data-role='destroy-mode'
 		data-info="delete"
-		class="ion-ios7-trash-outline"></span>
+		class="ion-ios-trash-outline"></span>
 <!--
 	<span
 		data-role='undo'
@@ -30,5 +30,5 @@
 	<span
 		data-role='toggle-layout-settings'
 		data-info="save layout"
-		class="ion-ios7-compose-outline"></span>
+		class="ion-ios-compose-outline"></span>
 </div>
-- 
cgit v1.2.3-70-g09d2


From b5d2503ec4e5844ab3793c9e48020bcbaef3112b Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 11 Aug 2015 13:22:31 -0400
Subject: blueprint integration into views

---
 .../javascripts/ui/blueprint/BlueprintScale.js     |   0
 .../javascripts/ui/blueprint/BlueprintUpload.js    | 122 +++++++++++++++++++++
 .../javascripts/ui/blueprint/BlueprintView.js      |  39 +++++++
 views/controls/builder/blueprint.ejs               |  92 ++++++++++++++++
 4 files changed, 253 insertions(+)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintScale.js
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintUpload.js
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintView.js
 create mode 100644 views/controls/builder/blueprint.ejs

(limited to 'views/controls/builder')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScale.js b/public/assets/javascripts/ui/blueprint/BlueprintScale.js
new file mode 100644
index 0000000..e69de29
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
new file mode 100644
index 0000000..fd3a659
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
@@ -0,0 +1,122 @@
+
+var BlueprintUploadView = UploadView.extend({
+	el: ".blueprintUpload",
+	
+	mediaTag: "blueprint",
+	createAction: "/api/media/new",
+	uploadAction: "/api/media/upload",
+	listAction: "/api/media/user",
+	destroyAction: "/api/media/destroy",
+
+	events: {
+		"mousedown": 'stopPropagation',
+    "change .url": "enterUrl",
+    "keydown .url": "enterSetUrl",
+    
+    "click .blueprint": "choose",
+    "change [name=blueprint-dimensions]": "changeDimensions",
+    "change [name=blueprint-units]": "changeUnits",
+    "click #saveBlueprint": "save",
+  },
+	
+	initialize: function(opt){
+	  this.parent = opt.parent
+	  this.__super__.initialize.call(this)
+
+    this.$url = this.$(".url")
+
+    this.$blueprintMap = this.$("#blueprintMap")
+    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
+    this.$dimensions = this.$("[name=blueprint-dimensions]")
+    this.$units = this.$("[name=blueprint-units]")
+    this.$save = this.$("#saveBlueprint")
+    
+    this.map = new Map ({ type: 'ortho' })
+    
+    this.load()
+	},
+	
+  loaded: false,
+	load: function(){
+		$.get(this.listAction, { tag: this.mediaTag }, this.populate.bind(this))
+	},
+
+	populate: function(data){
+		this.loaded = true
+		if (data && data.length) {
+		  data.forEach(this.append.bind(this))
+		  this.$(".txt").hide()
+		}
+		else {
+		  this.$(".txt").show()
+		}
+	},
+	
+	append: function(media){
+	  var $el = $("<div>")
+	  $el.data("id", media._id)
+	  $el.addClass("blueprint")
+	  this.$blueprints.append($el)
+	},
+	
+	pick: function(e){
+	  var $el = $(e.currentTarget)
+	  // load map with it
+	},
+  
+	destroy: function(_id, cb){
+		$.ajax({
+			type: "delete",
+			url: this.destroyAction,
+			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
+		}).complete(cb || function(){})
+	},
+	
+	show: function(){
+    this.toggle(true)
+	},
+	hide: function(){
+		this.toggle(false)
+	},
+	toggle: function (state) {
+    this.$el.toggleClass("active", state)
+	},
+
+	addUrl: function (url){
+		Parser.loadImage(url, function(media){
+			if (! media) return
+			media._csrf = $("[name=_csrf]").val()
+			media.tag = this.mediaTag
+			
+			var request = $.ajax({
+				type: "post",
+				url: this.createAction,
+				data: media,
+			})
+			request.done(this.add.bind(this))
+			
+		}.bind(this))
+	},
+  enterUrl: function(){
+  	var url = this.$url.sanitize()
+  	this.addUrl(url)
+  	this.$url.val("")
+  },
+	enterSetUrl: function (e) {
+		e.stopPropagation()
+		if (e.keyCode == 13) {
+			setTimeout(this.enterUrl.bind(this), 100)
+		}
+	},
+	
+	add: function(media){
+	  this.append(media)
+	},
+	changeDimensions: function(){
+	},
+	changeUnits: function(){
+	},
+	save: function(){
+	},
+
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
new file mode 100644
index 0000000..f7ee13e
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -0,0 +1,39 @@
+
+var BlueprintView = View.extend({
+	el: "#blueprintView",
+	
+	events: {
+	},
+	
+	initialize: function(){
+// 		this.info = new BuilderInfo ({ parent: this })
+// 		this.toolbar = new BuilderToolbar ({ parent: this })
+// 		this.settings = new BuilderSettings ({ parent: this })
+// 		this.colorControl = new ColorControl ({ parent: this })
+// 		this.cursor = new HelpCursor({ parent: this })
+    this.blueprintUpload = new BlueprintUploadView ({ parent: this })
+	},
+
+	load: function(name){
+// 		if (! name || name == "new") {
+// 			this.ready({ isNew: true, _id: "new", name: "" })
+// 			return
+// 		}
+// 		
+// 		name = sanitize(name)
+// 		
+// 		$.get(this.action + name, this.ready.bind(this))
+	},
+	
+	ready: function(data){
+// 		this.settings.load(data)
+// 		this.info.load(data)
+	},
+	
+	hideExtras: function(){
+	},
+
+	pickWall: function(wall, pos){
+	},
+
+})
diff --git a/views/controls/builder/blueprint.ejs b/views/controls/builder/blueprint.ejs
new file mode 100644
index 0000000..e5f3257
--- /dev/null
+++ b/views/controls/builder/blueprint.ejs
@@ -0,0 +1,92 @@
+<style type="text/css">
+html,body{width:100%;height:100%;margin:0;padding:0;}
+body {
+	overflow: hidden;
+}
+#perspective,
+#perspective .mx-scene {
+	position: absolute;
+	left:0%;
+	top:0px;
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
+}
+
+#orthographic {
+	position: absolute;
+	left:50%;
+	top:0px
+}
+.hud {
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 10px;
+  background: white;
+}
+.ortho-hud {
+  left: 50%;
+  border-left: 1px solid black;
+}
+#url { width: 300px }
+.hud span { color: #888; cursor: pointer; }
+.hud span.active { color: #000; }
+
+#blueprintForm {
+  width: 240px;
+}
+</style>
+
+<div id="blueprintView">
+  <div id="perspective"></div>
+  <div id="orthographic"></div>
+
+  <div class="hud persp-hud">
+    <input type="text" id="url" placeholder="paste an image URL here!">
+    <span class="ion-ionic active" data-role="orbit-mode"></span>
+    <span class="ion-archive" data-role="keyboard-mode"></span>
+  </div>
+
+  <div class="hud ortho-hud">
+    <span class="ion-navigate" data-role="arrow-mode"></span>
+    <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
+    <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
+    <span class="ion-scissors" data-role="eraser-mode"></span>
+  </div>
+
+  <div class="mediaDrawer fixed animate blueprintUpload active">
+    <span class="close">X</span>
+    <div class="box">
+    
+      <h2>Upload A Room Image</h2>
+    
+      <div id="blueprintForm">
+        <div class="wallpaperUpload toolButton">
+          <form>
+            <span class="ion-ios-upload-outline upload-icon"></span>
+            <label>Upload</label>
+            <input type="file" accept="image/*" multiple>
+          </form>
+        </div>
+        <input type="text" class="url" placeholder="Enter an image URL or...">
+      </div>
+    
+      Please tell us the scale of your map.
+      Click both corners of a wall, and then enter how long the wall is.
+    
+      <div id="blueprintMap">
+      </div>
+    
+      <div id="blueprintDimensions">
+        <input type="text" name="blueprint-dimensions">
+        <select id="blueprint-units" name="blueprint-units">
+          <option value="ft">foot</option>
+          <option value="m">meter</option>
+        </select>
+    
+        <button id="saveBlueprint">Save</button>
+      </div>
+
+    </div>
+  </div>
+</div>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 4024085b09261c23cd89227e340037e0238072c7 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 11 Aug 2015 14:15:31 -0400
Subject: uploader functioning

---
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  30 ++++++
 .../javascripts/ui/blueprint/BlueprintScale.js     |   0
 .../javascripts/ui/blueprint/BlueprintUpload.js    |  35 ++-----
 .../javascripts/ui/blueprint/BlueprintView.js      |   3 +-
 public/assets/stylesheets/app.css                  |   2 +-
 views/controls/blueprint/editor.ejs                | 104 +++++++++++++++++++++
 views/controls/builder/blueprint.ejs               |  92 ------------------
 views/modal.ejs                                    |   2 +-
 views/partials/scripts.ejs                         |   1 +
 9 files changed, 149 insertions(+), 120 deletions(-)
 create mode 100644 public/assets/javascripts/ui/blueprint/BlueprintEditor.js
 delete mode 100644 public/assets/javascripts/ui/blueprint/BlueprintScale.js
 create mode 100644 views/controls/blueprint/editor.ejs
 delete mode 100644 views/controls/builder/blueprint.ejs

(limited to 'views/controls/builder')

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
new file mode 100644
index 0000000..227c1c8
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -0,0 +1,30 @@
+
+var BlueprintEditor = ModalView.extend({
+	el: ".blueprintEditor",
+	
+	events: {
+    "change [name=blueprint-dimensions]": "changeDimensions",
+    "change [name=blueprint-units]": "changeUnits",
+    "click #saveBlueprint": "save",
+	},
+	
+	initialize: function(){
+    this.$blueprintMap = this.$("#blueprintMap")
+    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
+    this.$dimensions = this.$("[name=blueprint-dimensions]")
+    this.$units = this.$("[name=blueprint-units]")
+    this.$save = this.$("#saveBlueprint")
+
+    this.map = new Map ({ type: 'ortho' })
+
+    this.$blueprintMap.append(this.map.el)
+	},
+
+	changeDimensions: function(){
+	},
+	changeUnits: function(){
+	},
+	save: function(){
+	},
+
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScale.js b/public/assets/javascripts/ui/blueprint/BlueprintScale.js
deleted file mode 100644
index e69de29..0000000
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
index fd3a659..9467715 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
@@ -1,5 +1,5 @@
 
-var BlueprintUploadView = UploadView.extend({
+var BlueprintUpload = UploadView.extend({
 	el: ".blueprintUpload",
 	
 	mediaTag: "blueprint",
@@ -14,9 +14,6 @@ var BlueprintUploadView = UploadView.extend({
     "keydown .url": "enterSetUrl",
     
     "click .blueprint": "choose",
-    "change [name=blueprint-dimensions]": "changeDimensions",
-    "change [name=blueprint-units]": "changeUnits",
-    "click #saveBlueprint": "save",
   },
 	
 	initialize: function(opt){
@@ -24,15 +21,8 @@ var BlueprintUploadView = UploadView.extend({
 	  this.__super__.initialize.call(this)
 
     this.$url = this.$(".url")
+    this.$blueprints = this.$(".blueprints")
 
-    this.$blueprintMap = this.$("#blueprintMap")
-    this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
-    this.$dimensions = this.$("[name=blueprint-dimensions]")
-    this.$units = this.$("[name=blueprint-units]")
-    this.$save = this.$("#saveBlueprint")
-    
-    this.map = new Map ({ type: 'ortho' })
-    
     this.load()
 	},
 	
@@ -52,13 +42,6 @@ var BlueprintUploadView = UploadView.extend({
 		}
 	},
 	
-	append: function(media){
-	  var $el = $("<div>")
-	  $el.data("id", media._id)
-	  $el.addClass("blueprint")
-	  this.$blueprints.append($el)
-	},
-	
 	pick: function(e){
 	  var $el = $(e.currentTarget)
 	  // load map with it
@@ -112,11 +95,13 @@ var BlueprintUploadView = UploadView.extend({
 	add: function(media){
 	  this.append(media)
 	},
-	changeDimensions: function(){
-	},
-	changeUnits: function(){
-	},
-	save: function(){
-	},
 
+	append: function(media){
+	  var $el = $("<img>")
+	  $el.attr("src", media.url)
+	  $el.data("id", media._id)
+	  $el.addClass("blueprint")
+	  this.$blueprints.append($el)
+	},
+	
 })
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index f7ee13e..40c61d7 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -11,7 +11,8 @@ var BlueprintView = View.extend({
 // 		this.settings = new BuilderSettings ({ parent: this })
 // 		this.colorControl = new ColorControl ({ parent: this })
 // 		this.cursor = new HelpCursor({ parent: this })
-    this.blueprintUpload = new BlueprintUploadView ({ parent: this })
+    this.blueprintUpload = new BlueprintUpload ({ parent: this })
+    this.blueprintEditor = new BlueprintEditor ({ parent: this })
 	},
 
 	load: function(name){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index bb32500..0f89242 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1598,7 +1598,7 @@ form .paidPlan label { float: none; font-size: 16px; margin: 0 10px; }
 .mediaDrawer.alert, .mediaDrawer.confirm,
 .mediaDrawer.passwordForgot, .mediaDrawer.passwordReset, .mediaDrawer.usernameTaken,
 .mediaDrawer.layouts, .mediaDrawer.projects, .mediaDrawer.newProject,
-.mediaDrawer.blueprintUpload {
+.mediaDrawer.blueprintEditor {
     display:table;
 }
 .confirm button {
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
new file mode 100644
index 0000000..6b80287
--- /dev/null
+++ b/views/controls/blueprint/editor.ejs
@@ -0,0 +1,104 @@
+<style type="text/css">
+html,body{width:100%;height:100%;margin:0;padding:0;}
+body {
+	overflow: hidden;
+}
+#perspective,
+#perspective .mx-scene {
+	position: absolute;
+	left:0%;
+	top:0px;
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
+}
+
+#orthographic {
+	position: absolute;
+	left:50%;
+	top:0px
+}
+.hud {
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 10px;
+  background: white;
+}
+.ortho-hud {
+  left: 50%;
+  border-left: 1px solid black;
+}
+#url { width: 300px }
+.hud span { color: #888; cursor: pointer; }
+.hud span.active { color: #000; }
+
+.blueprintUpload {
+  width: 240px;
+}
+.blueprints .blueprint {
+  border: 1px solid black;
+  padding: 5px;
+  height: 100px;
+  max-width: 200px;
+  cursor: pointer;
+}
+</style>
+
+<div id="blueprintView">
+  <div id="perspective"></div>
+  <div id="orthographic"></div>
+
+  <div class="hud persp-hud">
+    <input type="text" id="url" placeholder="paste an image URL here!">
+    <span class="ion-ionic active" data-role="orbit-mode"></span>
+    <span class="ion-archive" data-role="keyboard-mode"></span>
+  </div>
+
+  <div class="hud ortho-hud">
+    <span class="ion-navigate" data-role="arrow-mode"></span>
+    <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
+    <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
+    <span class="ion-scissors" data-role="eraser-mode"></span>
+  </div>
+</div>
+
+<div class="mediaDrawer fixed animate active blueprintEditor">
+  <span class="close">X</span>
+  <div class="box">
+  
+    <h2>Upload your Blueprint</h2>
+  
+    <div class="blueprintUpload">
+      <input type="hidden" name="_csrf" value="[[- token ]]">
+      <div class="wallpaperUpload toolButton">
+        <form>
+          <span class="ion-ios-upload-outline upload-icon"></span>
+          <label>Upload</label>
+          <input type="file" accept="image/*" multiple>
+        </form>
+      </div>
+      <input type="text" class="url" placeholder="Enter an image URL or...">
+      <div class="blueprints">
+        <h5>Your uploaded blueprints</h5>
+      </div>
+    </div>
+    
+    Please tell us the scale of your blueprint.
+    Click both corners of a wall, and then enter how long the wall is.
+    https://s3.amazonaws.com/luckyplop/fbf4295da80f1f66c5e4a248f2ea3e1ce7a22c3d.jpg
+
+    <div id="blueprintMap">
+    </div>
+  
+    <div id="blueprintDimensions">
+      <input type="text" name="blueprint-dimensions">
+      <select id="blueprint-units" name="blueprint-units">
+        <option value="ft">foot</option>
+        <option value="m">meter</option>
+      </select>
+  
+      <button id="saveBlueprint">Save</button>
+    </div>
+
+  </div>
+</div>
diff --git a/views/controls/builder/blueprint.ejs b/views/controls/builder/blueprint.ejs
deleted file mode 100644
index e5f3257..0000000
--- a/views/controls/builder/blueprint.ejs
+++ /dev/null
@@ -1,92 +0,0 @@
-<style type="text/css">
-html,body{width:100%;height:100%;margin:0;padding:0;}
-body {
-	overflow: hidden;
-}
-#perspective,
-#perspective .mx-scene {
-	position: absolute;
-	left:0%;
-	top:0px;
-	-webkit-transform: translateZ(0);
-	transform: translateZ(0);
-}
-
-#orthographic {
-	position: absolute;
-	left:50%;
-	top:0px
-}
-.hud {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 10px;
-  background: white;
-}
-.ortho-hud {
-  left: 50%;
-  border-left: 1px solid black;
-}
-#url { width: 300px }
-.hud span { color: #888; cursor: pointer; }
-.hud span.active { color: #000; }
-
-#blueprintForm {
-  width: 240px;
-}
-</style>
-
-<div id="blueprintView">
-  <div id="perspective"></div>
-  <div id="orthographic"></div>
-
-  <div class="hud persp-hud">
-    <input type="text" id="url" placeholder="paste an image URL here!">
-    <span class="ion-ionic active" data-role="orbit-mode"></span>
-    <span class="ion-archive" data-role="keyboard-mode"></span>
-  </div>
-
-  <div class="hud ortho-hud">
-    <span class="ion-navigate" data-role="arrow-mode"></span>
-    <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
-    <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
-    <span class="ion-scissors" data-role="eraser-mode"></span>
-  </div>
-
-  <div class="mediaDrawer fixed animate blueprintUpload active">
-    <span class="close">X</span>
-    <div class="box">
-    
-      <h2>Upload A Room Image</h2>
-    
-      <div id="blueprintForm">
-        <div class="wallpaperUpload toolButton">
-          <form>
-            <span class="ion-ios-upload-outline upload-icon"></span>
-            <label>Upload</label>
-            <input type="file" accept="image/*" multiple>
-          </form>
-        </div>
-        <input type="text" class="url" placeholder="Enter an image URL or...">
-      </div>
-    
-      Please tell us the scale of your map.
-      Click both corners of a wall, and then enter how long the wall is.
-    
-      <div id="blueprintMap">
-      </div>
-    
-      <div id="blueprintDimensions">
-        <input type="text" name="blueprint-dimensions">
-        <select id="blueprint-units" name="blueprint-units">
-          <option value="ft">foot</option>
-          <option value="m">meter</option>
-        </select>
-    
-        <button id="saveBlueprint">Save</button>
-      </div>
-
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/views/modal.ejs b/views/modal.ejs
index 433861e..775ba88 100644
--- a/views/modal.ejs
+++ b/views/modal.ejs
@@ -10,7 +10,7 @@
 
 	<div style="height: 70%; clear: both;" id="content"></div>
 
-	[[ include controls/builder/blueprint ]]
+	[[ include controls/blueprint/editor ]]
 	[[ include partials/confirm-modal ]]
 	[[ include partials/sign-in ]]	
 	[[ include projects/layouts-modal ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 64ac135..2a93e9b 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -128,6 +128,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUpload.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 272474767b6ed1f419843c7a205c16f934eeb84f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 20 Aug 2015 23:33:36 -0400
Subject: turn segments into rects

---
 .../rectangles/engine/shapes/regionlist.js         | 54 ++++++++--------------
 .../assets/javascripts/rectangles/models/rect.js   |  6 +++
 .../assets/javascripts/rectangles/models/vec2.js   |  3 ++
 .../javascripts/ui/blueprint/BlueprintEditor.js    |  2 +-
 .../javascripts/ui/blueprint/BlueprintSettings.js  | 16 ++++---
 public/assets/javascripts/ui/lib/ToggleableView.js | 19 ++++++++
 views/controls/blueprint/info.ejs                  |  4 +-
 views/controls/builder/info.ejs                    |  4 +-
 views/controls/editor/media-editor.ejs             |  4 +-
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 65 insertions(+), 48 deletions(-)
 create mode 100644 public/assets/javascripts/ui/lib/ToggleableView.js

(limited to 'views/controls/builder')

diff --git a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
index 94b902a..42519cf 100644
--- a/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
+++ b/public/assets/javascripts/rectangles/engine/shapes/regionlist.js
@@ -12,7 +12,7 @@ var RegionList = (function(){
     var rooms = []
     var open_segments = []
     
-    var segment, open_segment, vertical, other_side
+    var segment, open_segment, y_segments
 
     for (var i = 0; i < segments.length; i++) {
       segment = segments[i]
@@ -21,12 +21,20 @@ var RegionList = (function(){
       }
       for (var j = 0; j < open_segments.length; j++) {
         open_segment = open_segments[j]
-        if (overlaps(segment, open_segment)) {
+        if (segment.y.overlaps(open_segment.y)) {
           // if we have overlap, it means we have made a full room
-          other_side = clone_segment(open_segment)
-          other_side[0].a = segment[0].a
-          other_side[1].a = segment[1].a
-          rooms.push([open_segment, other_side])
+          
+          y_segments = open_segment.y.split(segment.y)
+          
+          if (y_segments.length == 1) {
+            open_segment.x.b = segment.x.b
+            rooms.push(open_segment)
+          }
+          
+//           other_side = clone_segment(open_segment)
+//           other_side[0].a = segment[0].a
+//           other_side[1].a = segment[1].a
+//           rooms.push([open_segment, other_side])
           open_segments.splice(j, 1)
           j--
         }
@@ -43,8 +51,8 @@ var RegionList = (function(){
     // get a list of all segments from these polylines
     var segments = shapes.getAllSegments()
 
-    // re-orientate them so they're either facing up or right
-    segments.forEach(function(segment){
+    // re-orient them so they're either facing up or right and make them into rects
+    segments = segments.map(function(segment){
       // vertical
       if (segment[0].a == segment[1].a) {
         if (segment[0].b > segment[1].b) {
@@ -57,36 +65,12 @@ var RegionList = (function(){
           segment.push(segment.shift())
         }
       }
+      return new Rect( segment[0].a, segment[0].b, segment[1].a, segment[1].b )
     })
     
-    // sort them from top to bottom, left to right
-    segments = segments.sort(function(a,b){
-      if (a[0].a < b[0].a) {
-        return -1
-      }
-      else if (a[0].a == b[0].a) {
-        if (a[0].b < b[0].b) {
-          return -1
-        }
-        else if (a[0].b == b[0].b) {
-          return 0
-        }
-        else {
-          return 1
-        }
-      }
-      else {
-        return 1
-      }
-    })
-    
-    return segments
+    return sort.rects_by_position(segments)
   }
-  
-  function isVertical (segment) { return segment[0].a == segment[1].a }
-  function isHorizontal (segment) { return segment[0].b == segment[1].b }
-  function overlaps (a,b) { return (a[0].b > b[0].b || a[1].b < b[1].b) }
-  function clone_segment(a){ return [a[0].clone(), a[1].clone()] }
+
   return RegionList
   
 })()
\ No newline at end of file
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 92c8c9e..a4756ed 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -62,6 +62,12 @@
 	Rect.prototype.maxDimension = function(){
 		return abs(this.width) > abs(this.height) ? this.width : this.height
 	}
+	Rect.prototype.isVertical = function(){
+	  return this.x.isPoint()
+	}
+	Rect.prototype.isHorizontal = function(){
+	  return this.y.isPoint()
+	}
 
 	Rect.prototype.mul = function(n){
 		this.x.mul(n)
diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js
index 290e45e..90a56c6 100644
--- a/public/assets/javascripts/rectangles/models/vec2.js
+++ b/public/assets/javascripts/rectangles/models/vec2.js
@@ -43,6 +43,9 @@
 	vec2.prototype.eq = function(v){
 		return this.a == v.a && this.b == v.b
 	}
+	vec2.prototype.isPoint = function(){
+		return this.a == this.b
+	}
 	vec2.prototype.add = function(n){
 		this.a += n
 		this.b += n
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
index 8fe66ca..18ecf5f 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -93,7 +93,7 @@ var BlueprintEditor = View.extend(AnimatedView.prototype).extend({
     map.draw.ctx.save()
     map.draw.translate()
 
-   // this.floorplan.draw(map.draw.ctx, true)
+   this.floorplan.draw(map.draw.ctx, true)
 
     map.draw.coords()
 
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
index acd8dcc..252e3f1 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintSettings.js
@@ -1,5 +1,5 @@
 
-var BlueprintSettings = FormView.extend({
+var BlueprintSettings = FormView.extend(ToggleableView.prototype).extend({
 	el: "#blueprintSettings",
 	
 	action: "/api/blueprint/edit",
@@ -25,7 +25,13 @@ var BlueprintSettings = FormView.extend({
 	
 	load: function(data){
 		this.$id.val(data._id)
-		this.$name.val(data.name)
+		if (data.name) {
+		  this.$name.val(data.name)
+      this.hide()
+		}
+		else {
+		  this.$name.val("")
+		}
 		if (data.shapes) {
       shapes.destroy()
       shapes.deserialize( data.shapes )
@@ -51,10 +57,6 @@ var BlueprintSettings = FormView.extend({
 		}.bind(this))
 	},
 
-	toggle: function(state){
-		this.$el.toggleClass("active", state)
-	},
-
 	enterSubmit: function (e) {
 		e.stopPropagation()
 		var base = this
@@ -105,6 +107,8 @@ var BlueprintSettings = FormView.extend({
 		this.$name.val(data.name)
 		this.action = this.updateAction
 		
+		this.hide()
+		
 		Minotaur.unwatch(this)
 		Minotaur.hide()
 
diff --git a/public/assets/javascripts/ui/lib/ToggleableView.js b/public/assets/javascripts/ui/lib/ToggleableView.js
new file mode 100644
index 0000000..371629f
--- /dev/null
+++ b/public/assets/javascripts/ui/lib/ToggleableView.js
@@ -0,0 +1,19 @@
+var ToggleableView = View.extend({
+
+	toggle: function(state){
+		this.$el.toggleClass("active", state)
+	},
+	
+	show: function(){
+	  this.toggle(true)
+	},
+
+	hide: function(){
+	  this.toggle(false)
+	},
+	
+	visible: function(){
+	  return this.$el.hasClass("active")
+	}
+
+})
\ No newline at end of file
diff --git a/views/controls/blueprint/info.ejs b/views/controls/blueprint/info.ejs
index 9f7d708..4e2316f 100644
--- a/views/controls/blueprint/info.ejs
+++ b/views/controls/blueprint/info.ejs
@@ -15,8 +15,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 8a0e0d5..11e995a 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -34,8 +34,8 @@
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 2a3d4f3..225bdc8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -49,8 +49,8 @@
 	<div class="setting number">
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="ft">foot</option>
-			<option value="m">meter</option>
+			<option value="ft">feet</option>
+			<option value="m">meters</option>
 		</select>
 	</div>
 	-->
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index bc8dacb..865c0f1 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -108,6 +108,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/lib/FormView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/UploadView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AnimatedView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ToggleableView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/lib/ErrorModal.js"></script>
-- 
cgit v1.2.3-70-g09d2