From 1a612376cb891af8487d3c0bad8d69c0f893198f Mon Sep 17 00:00:00 2001
From: mmcwilliams <hi@mmcwilliams.com>
Date: Sat, 20 Apr 2019 10:15:01 -0400
Subject: [PATCH] Grid works for dual projectors. cam needs to be examined.

---
 app/lib/ui/grid.js     | 115 +++++++++++++++++++++++------------------
 app/src/lib/ui/grid.ts |  72 ++++++++++++++------------
 2 files changed, 102 insertions(+), 85 deletions(-)

diff --git a/app/lib/ui/grid.js b/app/lib/ui/grid.js
index c392012..b90ca88 100644
--- a/app/lib/ui/grid.js
+++ b/app/lib/ui/grid.js
@@ -154,14 +154,14 @@ class Grid {
         // if input was not checked, but now is
         // event occurs after user action
         c = $(elem).attr('class').replace('.', '');
+        other = this.otherCmd(x, c);
+        if (seq.grid[x]) {
+            current = seq.grid[x].cmd + ''; // cast to string, bad hack
+        }
         if (checked) {
-            if (cam.second.enabled) {
-                other = this.otherCmd(x, c);
+            if (cam.second.enabled && current.indexOf('C') !== -1) {
                 if (c === cfg.cmd.camera_forward) {
-                    if (other === '') {
-                        //skip modification
-                    }
-                    else if (other === cfg.cmd.camera_second_forward) {
+                    if (other === cfg.cmd.camera_second_forward) {
                         c = cfg.cmd.cameras_forward;
                     }
                     else if (other === cfg.cmd.camera_second_backward) {
@@ -169,10 +169,7 @@ class Grid {
                     }
                 }
                 else if (c === cfg.cmd.camera_backward) {
-                    if (other === '') {
-                        //skip modification
-                    }
-                    else if (other === cfg.cmd.camera_second_forward) {
+                    if (other === cfg.cmd.camera_second_forward) {
                         c = cfg.cmd.camera_backward_camera_second_forward;
                     }
                     else if (other === cfg.cmd.camera_second_backward) {
@@ -180,10 +177,7 @@ class Grid {
                     }
                 }
                 else if (c === cfg.cmd.camera_second_forward) {
-                    if (other === '') {
-                        //skip modification
-                    }
-                    else if (other === cfg.cmd.camera_forward) {
+                    if (other === cfg.cmd.camera_forward) {
                         c = cfg.cmd.cameras_forward;
                     }
                     else if (other === cfg.cmd.camera_second_backward) {
@@ -191,10 +185,7 @@ class Grid {
                     }
                 }
                 else if (c === cfg.cmd.camera_second_backward) {
-                    if (other === '') {
-                        //skip modification
-                    }
-                    else if (other === cfg.cmd.camera_second_forward) {
+                    if (other === cfg.cmd.camera_second_forward) {
                         c = cfg.cmd.camera_backward_camera_second_forward;
                     }
                     else if (other === cfg.cmd.camera_second_backward) {
@@ -202,11 +193,13 @@ class Grid {
                     }
                 }
             }
-            if (proj.second.enabled) {
-                other = this.otherCmd(x, c);
+            else if (proj.second.enabled && current.indexOf('P') !== -1) {
                 if (c === cfg.cmd.projector_forward) {
-                    if (other === '') {
-                        //skip modification
+                    if (current === cfg.cmd.projectors_backward) {
+                        c = cfg.cmd.projector_forward_projector_second_backward;
+                    }
+                    else if (current === cfg.cmd.projector_backward_projector_second_forward) {
+                        c = cfg.cmd.projectors_forward;
                     }
                     else if (other === cfg.cmd.projector_second_forward) {
                         c = cfg.cmd.projectors_forward;
@@ -216,8 +209,11 @@ class Grid {
                     }
                 }
                 else if (c === cfg.cmd.projector_backward) {
-                    if (other === '') {
-                        //skip modification
+                    if (current === cfg.cmd.projectors_forward) {
+                        c = cfg.cmd.projector_backward_projector_second_forward;
+                    }
+                    else if (current === cfg.cmd.projector_forward_projector_second_backward) {
+                        c = cfg.cmd.projectors_backward;
                     }
                     else if (other === cfg.cmd.projector_second_forward) {
                         c = cfg.cmd.projector_backward_projector_second_forward;
@@ -227,8 +223,11 @@ class Grid {
                     }
                 }
                 else if (c === cfg.cmd.projector_second_forward) {
-                    if (other === '') {
-                        //skip modification
+                    if (current === cfg.cmd.projectors_backward) {
+                        c = cfg.cmd.projector_backward_projector_second_forward;
+                    }
+                    else if (current === cfg.cmd.projector_forward_projector_second_backward) {
+                        c = cfg.cmd.projectors_forward;
                     }
                     else if (other === cfg.cmd.projector_forward) {
                         c = cfg.cmd.projectors_forward;
@@ -238,8 +237,11 @@ class Grid {
                     }
                 }
                 else if (c === cfg.cmd.projector_second_backward) {
-                    if (other === '') {
-                        //skip modification
+                    if (current === cfg.cmd.projectors_forward) {
+                        c = cfg.cmd.projector_forward_projector_second_backward;
+                    }
+                    else if (current === cfg.cmd.projector_backward_projector_second_forward) {
+                        c = cfg.cmd.projectors_backward;
                     }
                     else if (other === cfg.cmd.projector_forward) {
                         c = cfg.cmd.projector_forward_projector_second_backward;
@@ -249,41 +251,47 @@ class Grid {
                     }
                 }
             }
-            console.log(c);
             seq.set(x, c);
         }
         else {
-            if (seq.grid[x]) {
-                current = seq.grid[x].cmd + ''; // cast to string, bad hack
-            }
-            if (cam.second.enabled) {
-                other = this.otherCmd(x, c);
-                if (c === cfg.cmd.camera_forward
-                    || c === cfg.cmd.camera_backward) {
-                    if (other === '') {
-                        c = '';
-                    }
-                    else if (other === cfg.cmd.camera_second_forward) {
+            if (cam.second.enabled && current.indexOf('C') !== -1) {
+                if (current === cfg.cmd.cameras_forward) {
+                    if (other === cfg.cmd.camera_second_forward) {
                         c = cfg.cmd.camera_second_forward;
                     }
-                    else if (other === cfg.cmd.camera_second_backward) {
-                        c = cfg.cmd.camera_second_backward;
-                    }
-                }
-                else if (c === cfg.cmd.camera_second_forward
-                    || c === cfg.cmd.camera_second_backward) {
-                    if (other === '') {
-                        c = '';
-                    }
                     else if (other === cfg.cmd.camera_forward) {
                         c = cfg.cmd.camera_forward;
                     }
+                }
+                else if (current === cfg.cmd.cameras_backward) {
+                    if (other === cfg.cmd.camera_second_backward) {
+                        c = cfg.cmd.camera_second_backward;
+                    }
                     else if (other === cfg.cmd.camera_backward) {
                         c = cfg.cmd.camera_backward;
                     }
                 }
+                else if (current === cfg.cmd.camera_forward_projector_second_backward) {
+                    if (other === cfg.cmd.camera_second_backward) {
+                        c = cfg.cmd.camera_second_backward;
+                    }
+                    else if (other === cfg.cmd.camera_forward) {
+                        c = cfg.cmd.camera_forward;
+                    }
+                }
+                else if (current === cfg.cmd.camera_backward_projector_second_forward) {
+                    if (other === cfg.cmd.camera_second_forward) {
+                        c = cfg.cmd.camera_second_forward;
+                    }
+                    else if (other === cfg.cmd.camera_backward) {
+                        c = cfg.cmd.camera_backward;
+                    }
+                }
+                else {
+                    c = '';
+                }
             }
-            if (proj.second.enabled) {
+            else if (proj.second.enabled && current.indexOf('P') !== -1) {
                 other = this.otherCmd(x, c);
                 if (current === cfg.cmd.projectors_forward) {
                     if (other === cfg.cmd.projector_second_forward) {
@@ -317,12 +325,17 @@ class Grid {
                         c = cfg.cmd.projector_backward;
                     }
                 }
+                else {
+                    c = '';
+                }
+            }
+            else {
+                c = '';
             }
             if (c === '') {
                 seq.unset(x);
             }
             else {
-                console.log(c);
                 seq.set(x, c);
             }
         }
diff --git a/app/src/lib/ui/grid.ts b/app/src/lib/ui/grid.ts
index e51712e..aa808a8 100644
--- a/app/src/lib/ui/grid.ts
+++ b/app/src/lib/ui/grid.ts
@@ -169,73 +169,77 @@ class Grid {
 		// if input was not checked, but now is
 		// event occurs after user action
 		c = $(elem).attr('class').replace('.', '');
+		other = this.otherCmd(x, c);
+		if (seq.grid[x]) {
+			current = seq.grid[x].cmd + ''; // cast to string, bad hack
+		}
 		if (checked) {
-			if (cam.second.enabled) {
-				other = this.otherCmd(x, c);
+			if (cam.second.enabled && current.indexOf('C') !== -1) {
 				if (c === cfg.cmd.camera_forward) {
-					if (other === '') {
-						//skip modification
-					} else if (other === cfg.cmd.camera_second_forward) {
+					if (other === cfg.cmd.camera_second_forward) {
 						c = cfg.cmd.cameras_forward;
 					} else if (other === cfg.cmd.camera_second_backward) {
 						c = cfg.cmd.camera_forward_camera_second_backward;
 					}
 				} else if (c === cfg.cmd.camera_backward) {
-					if (other === '') {
-						//skip modification
-					} else if (other === cfg.cmd.camera_second_forward) {
+					if (other === cfg.cmd.camera_second_forward) {
 						c = cfg.cmd.camera_backward_camera_second_forward;
 					} else if (other === cfg.cmd.camera_second_backward) {
 						c = cfg.cmd.cameras_backward;
 					}
 				} else if (c === cfg.cmd.camera_second_forward) {
-					if (other === '') {
-						//skip modification
-					} else if (other === cfg.cmd.camera_forward) {
+					if (other === cfg.cmd.camera_forward) {
 						c = cfg.cmd.cameras_forward;
 					} else if (other === cfg.cmd.camera_second_backward) {
 						c = cfg.cmd.camera_forward_camera_second_backward;
 					}
 				} else if (c === cfg.cmd.camera_second_backward) {
-					if (other === '') {
-						//skip modification
-					} else if (other === cfg.cmd.camera_second_forward) {
+					if (other === cfg.cmd.camera_second_forward) {
 						c = cfg.cmd.camera_backward_camera_second_forward;
 					} else if (other === cfg.cmd.camera_second_backward) {
 						c = cfg.cmd.cameras_backward;
 					}
 				}
-			}
-
-			if (proj.second.enabled) {
-				other = this.otherCmd(x, c);
+			} else if (proj.second.enabled && current.indexOf('P') !== -1) {
 				if (c === cfg.cmd.projector_forward) {
-					if (other === '') {
-						//skip modification
+
+					if (current === cfg.cmd.projectors_backward) {
+						c = cfg.cmd.projector_forward_projector_second_backward;
+					} else if (current === cfg.cmd.projector_backward_projector_second_forward) {
+						c = cfg.cmd.projectors_forward;
 					} else if (other === cfg.cmd.projector_second_forward) {
 						c = cfg.cmd.projectors_forward;
 					} else if (other === cfg.cmd.projector_second_backward) {
 						c = cfg.cmd.projector_forward_projector_second_backward;
 					}
 				} else if (c === cfg.cmd.projector_backward) {
-					if (other === '') {
-						//skip modification
+
+					if (current === cfg.cmd.projectors_forward) {
+						c = cfg.cmd.projector_backward_projector_second_forward;
+					} else if (current === cfg.cmd.projector_forward_projector_second_backward) {
+						c = cfg.cmd.projectors_backward;
 					} else if (other === cfg.cmd.projector_second_forward) {
 						c = cfg.cmd.projector_backward_projector_second_forward;
 					} else if (other === cfg.cmd.projector_second_backward) {
 						c = cfg.cmd.projectors_backward;
 					}
 				} else if (c === cfg.cmd.projector_second_forward) {
-					if (other === '') {
-						//skip modification
+
+					if (current === cfg.cmd.projectors_backward) {
+						c = cfg.cmd.projector_backward_projector_second_forward;
+					} else if (current === cfg.cmd.projector_forward_projector_second_backward) {
+						c = cfg.cmd.projectors_forward;
 					} else if (other === cfg.cmd.projector_forward) {
 						c = cfg.cmd.projectors_forward;
 					} else if (other === cfg.cmd.projector_backward) {
 						c = cfg.cmd.projector_backward_projector_second_forward;
 					}
 				} else if (c === cfg.cmd.projector_second_backward) {
-					if (other === '') {
-						//skip modification
+
+					if (current === cfg.cmd.projectors_forward) {
+						c = cfg.cmd.projector_forward_projector_second_backward;
+					} else if (current === cfg.cmd.projector_backward_projector_second_forward) {
+						c = cfg.cmd.projectors_backward;
 					} else if (other === cfg.cmd.projector_forward) {
 						c = cfg.cmd.projector_forward_projector_second_backward;
 					} else if (other === cfg.cmd.projector_backward) {
@@ -245,11 +249,7 @@ class Grid {
 			}
 			seq.set(x, c);
 		} else {
-			if (seq.grid[x]) {
-				current = seq.grid[x].cmd + '' // cast to string, bad hack
-			}
-			if (cam.second.enabled) {
-				other = this.otherCmd(x, c);
+			if (cam.second.enabled && current.indexOf('C') !== -1) {
 				if (current === cfg.cmd.cameras_forward) {
 					if (other === cfg.cmd.camera_second_forward) {
 						c = cfg.cmd.camera_second_forward;
@@ -274,10 +274,10 @@ class Grid {
 					} else if (other === cfg.cmd.camera_backward) {
 						c = cfg.cmd.camera_backward;
 					}
+				} else {
+					c = '';
 				}
-			}
-
-			if (proj.second.enabled) {
+			} else if (proj.second.enabled && current.indexOf('P') !== -1) {
 				other = this.otherCmd(x, c);
 				if (current === cfg.cmd.projectors_forward) {
 					if (other === cfg.cmd.projector_second_forward) {
@@ -303,7 +303,11 @@ class Grid {
 					} else if (other === cfg.cmd.projector_backward) {
 						c = cfg.cmd.projector_backward;
 					}
+				} else {
+					c = '';
 				}
+			} else {
+				c = '';
 			}
 			if (c === '') {
 				seq.unset(x);