From 22f34524e2e9d6f1ee977a2dba7c3ce7f2486d6b Mon Sep 17 00:00:00 2001
From: chaopower <chao.zhang@jmdna.com>
Date: Wed, 12 Jul 2023 14:52:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server.py         | 13 ++++++++++++-
 tools/novaplus.py |  6 ++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/server.py b/server.py
index df4ea8a..55cd3ce 100644
--- a/server.py
+++ b/server.py
@@ -2,6 +2,7 @@ import socket
 import struct
 import json
 import os
+import sys
 from datetime import datetime
 
 from tools.common import basedir
@@ -86,4 +87,14 @@ def server():
 
 
 if __name__ == '__main__':
-    server()
+    if len(sys.argv) > 1:
+        select_type = sys.argv[1]
+        if select_type == 'nova':
+            layout = NovaPlus(sys.argv[2], data_limit=800)
+        elif select_type == 'xplus':
+            layout = NovaPlus(sys.argv[2], data_limit=400)
+        else:
+            layout = T7(sys.argv[2], data_limit=1520)
+        outputpath = layout.run()
+    else:
+        server()
diff --git a/tools/novaplus.py b/tools/novaplus.py
index fa16311..6598b87 100644
--- a/tools/novaplus.py
+++ b/tools/novaplus.py
@@ -7,7 +7,7 @@ from datetime import datetime
 import time
 import logging
 import os
-from .common import basedir, log
+from tools.common import basedir, log
 
 
 class AutoLayout:
@@ -205,6 +205,7 @@ class AutoLayout:
                 self.loc_chip_num += 1
 
     def run(self):
+        self.assign_samples()
         try:
             self.assign_samples()
         except Exception as e:
@@ -232,9 +233,10 @@ class AutoLayout:
         writer.close()
         return outputpath
 
+
 if __name__ == '__main__':
     start_time = time.time()
-    excel_file = 'example/0704_nova_1.xlsx'
+    excel_file = '../example/t1(1).xlsx'
     output_file = ''
     layout = AutoLayout(excel_file, output_file, data_limit=800)
     layout.run()