zx преди 5 години
родител
ревизия
9a1690bb03
променени са 3 файла, в които са добавени 2 реда и са изтрити 4 реда
  1. 1 1
      GarageMeasurement.pro.user
  2. 0 2
      mainwindow.cpp
  3. 1 1
      src/measuretask.cpp

+ 1 - 1
GarageMeasurement.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.4.1, 2019-11-05T11:29:48. -->
+<!-- Written by QtCreator 4.4.1, 2019-11-11T10:13:44. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

+ 0 - 2
mainwindow.cpp

@@ -97,8 +97,6 @@ void MainWindow::on_m_test_btn_clicked()
 extern CProcess* m_pProcess;
 void MainWindow::on_m_add_clicked()
 {
-    CBinaryData* data=new CBinaryData();
-    delete data;
 
     m_pProcess->PushTask(0xFF,1,false);
     AddLog(" test tsak ");

+ 1 - 1
src/measuretask.cpp

@@ -354,7 +354,7 @@ void  MeasureTask::Main()
         usleep(100*1000);
     }
 
-    while (!m_exit && !IsLaserReady()) { usleep(1000); }	//等待摆扫结束
+    while (!m_exit && !IsLaserReady()) { usleep(1000*100); }	//等待摆扫结束
 
 
     std::vector<CarPosition> results;