Logs panel and cpp objects wrapping

killpl · Apr 29, 2017 · 84974d0 · 84974d0
1 parent fe382da
commit 84974d0
Show file tree

Hide file tree

Showing 18 changed files with 301 additions and 40 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/index.html b/app/index.html
@@ -5,6 +5,7 @@
   <title></title>
   <link rel="stylesheet" href="stylesheets/application.css" />
   <link rel="stylesheet" href="stylesheets/logsWindow.css" />
+  <link rel="stylesheet" href="stylesheets/logsPanel.css" />
 
   <script src="javascripts/renderer/application.js" type="text/javascript"></script>
 </head>

diff --git a/app/javascripts/main/index.js b/app/javascripts/main/index.js
@@ -12,8 +12,11 @@ path = require('path');
 json = require('../../package.json');
 electron = require('electron');
 
+const {ipcMain} = require('electron')
+
 // Import windows creation logic
 prepareMainWindow = require('./mainWindow').prepareMainWindow
+prepareLogsWindow = require('./logger').prepareLogsWindow
 
 
 electron.app.on('ready', function() {
@@ -45,3 +48,12 @@ electron.app.on('ready', function() {
 
   var window = prepareMainWindow(electron.app, _onWindowLoaded);
 });
+
+
+ipcMain.on('logs_detached', (event, args) => {
+  console.log(args);
+  // Create window and attach on load
+  var window = prepareLogsWindow(()=> {
+    window.webContents.send('attach_logs_node_window', args);
+  });
+});
diff --git a/app/javascripts/main/logger.js b/app/javascripts/main/logger.js
@@ -5,12 +5,35 @@ json = require('../../package.json');
 electron = require('electron');
 
 
-export function prepareLogsWindow(logsNode)
+exports.prepareLogsWindow = function(onLoad)
 {
+  var window;
 
+  window = new electron.BrowserWindow({
+    title: "Logs",
+    width: 400,
+    height: 300
+  });
+
+  window.loadURL('file://' + path.join(__dirname, '..', '..') + '/logsWindow.html');
+
+  window.webContents.on('did-finish-load', function(){
+    if (onLoad) {
+    	onLoad();
+    }
+  });
+
+  window.on('closed', function() {
+    window = null;
+
+    // Re-attach
+
+  });
+
+  return window;
 }
 
-export function prepareLogsNode()
+exports.prepareLogsNode =  function ()
 {
 
 }
diff --git a/app/javascripts/main/mainWindow.js b/app/javascripts/main/mainWindow.js
@@ -30,6 +30,13 @@ exports.prepareMainWindow = function(app, onLoad)
 
     if (onLoad) {
     	onLoad();
+
+      console.log(cougar);
+      console.log(cougar.SerialPort());
+
+      console.log("TEST");
+      console.log(cougar.SerialPort().GetDevices());
+      console.log("TEST END");
     }
   });
 

diff --git a/app/javascripts/renderer/application.js b/app/javascripts/renderer/application.js
@@ -1,5 +1,5 @@
 const { ipcRenderer } = require('electron');
-$ = require('jquery');
+const $ = require('jquery');
 
 ipcRenderer.on('loaded', function(event, data) {
   document.getElementById('title').innerHTML = data.appName + ' App';
@@ -16,6 +16,9 @@ ipcRenderer.on('loaded', function(event, data) {
       <button id="logsButtonInfo"><input type="checkbox" checked>INFO</input></button>
       <button id="logsButtonDebug"><input type="checkbox" checked>DEBUG</input></button>
 
+
+      <button id="logsButtonDetach">Swap</button>
+
       <table id="logsTable">
       	<thead>
       		<th id="logsTableHeader">Timestamp</th>
@@ -35,11 +38,15 @@ ipcRenderer.on('loaded', function(event, data) {
       }
     };
 
-    // Actions
+    // Actions --------
     $("#logsButtonClear").on("click", function(){
       $("#logsTable tbody").empty();
     });
 
+    $("#logsButtonDetach").on("click", function(){
+      ipcRenderer.send('logs_detached', $("#logsTableContainer").detach());
+    });
+
     $("#logsButtonError").on("click",   function(){ hideWithClass("#logsButtonError",   ".logsTableError") });
     $("#logsButtonWarning").on("click", function(){ hideWithClass("#logsButtonWarning", ".logsTableWarning") });
     $("#logsButtonInfo").on("click",    function(){ hideWithClass("#logsButtonInfo",    ".logsTableInfo") });

diff --git a/app/logsWindow.html b/app/logsWindow.html
@@ -3,8 +3,8 @@
 <head>
   <meta charset="UTF-8">
   <title></title>
-  <link rel="stylesheet" href="stylesheets/logsWindow.css" />
-  <!--<script src="javascripts/renderer/application.js" type="text/javascript"></script>-->
+  <link rel="stylesheet" href="stylesheets/logsPanel.css" />
+  <script src="javascripts/renderer/logsWindow.js" type="text/javascript"></script>
 </head>
 <body>
   <div class="message">

diff --git a/app/stylesheets/logsWindow.css b/app/stylesheets/logsWindow.css
@@ -4,23 +4,8 @@
 	font-size: 0.75em;
 }
 
-#logsTableContainer {
-	position: absolute;
-	left: 0;
-	bottom: 0;
-
-	margin: 2px;
-	border-top: 1px solid gray;
-
-	width: 100%;
-	height: 200px;
-	resize: vertical;
-
-	overflow-y: auto;
-	display: block;
-}
-
 #logsTableHeader {
+	color: lightgray;
 	font-variant: small-caps;
 }
 
@@ -47,4 +32,4 @@
 
 .logsTableInfo {
 	color: lightgreen;
-}
+}
diff --git a/cougar_bluetooth_lib/build/Release/cougar_bluetooth_lib.node b/cougar_bluetooth_lib/build/Release/cougar_bluetooth_lib.node
diff --git a/cougar_bluetooth_lib/build/Release/obj.target/cougar_bluetooth_lib/cougar_bluetooth_lib.o b/cougar_bluetooth_lib/build/Release/obj.target/cougar_bluetooth_lib/cougar_bluetooth_lib.o
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/adam.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/adam.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/cougar_bluetooth_lib/cougar_bluetooth_lib.cc b/cougar_bluetooth_lib/cougar_bluetooth_lib.cc
@@ -70,7 +70,6 @@ namespace Cougar_Bluetooth {
          */
         static NAN_METHOD(GetStatus)
         {
-
             Cougar_Bluetooth* obj = Nan::ObjectWrap::Unwrap<Cougar_Bluetooth>(info.Holder());
 
             switch(obj->_cougarBluetooth->GetStatus())

diff --git a/cougar_lib/build/Release/obd_cougar.node b/cougar_lib/build/Release/obd_cougar.node
diff --git a/cougar_lib/build/Release/obj.target/obd_cougar/obd_cougar_lib.o b/cougar_lib/build/Release/obj.target/obd_cougar/obd_cougar_lib.o
diff --git a/cougar_lib/build/Release/obj.target/obd_cougar/serial/macOS/InterfacesOSX.o b/cougar_lib/build/Release/obj.target/obd_cougar/serial/macOS/InterfacesOSX.o
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/adam.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/adam.xcuserdatad/UserInterfaceState.xcuserstate