set car status color.........

deploy.sh

@@ -2,45 +2,13 @@
 
 #Qtgccdir=''
 Qtgccdir='/usr/lib/aarch64-linux-gnu/qt5'
-#QtLibDir=/usr/lib/aarch64-linux-gnu/
-
-
-if [ ${#Qtgccdir} -lt 6 ]; then
-  echo "Because not set gcc_64 , so auto find gcc_64 "
-  optfiles=`find /opt -name 'gcc_64'` 
-  for entry in $optfiles
-  do
-     if [ ${entry:0-6:6} == "gcc_64" ];  then
-       if [ -d $entry ];  then
-          Qtgccdir="$entry"
-	  echo -e "\033[32m""  -----found gccdir:"$Qtgccdir"\033[0m"
-       fi
-     fi
-  done
-fi
+QtLibDir=/usr/lib/aarch64-linux-gnu/
 
-if [ ${#Qtgccdir} -lt 6 ]; then
-  if [ -d '/usr/lib/aarch64-linux-gnu/qt5' ]; then
-    Qtgccdir='/usr/lib/aarch64-linux-gnu/qt5'
-  else 
-    echo "if NVIDIA,please sudo apt install qt"
-  fi
-fi
 
-if [ ${#Qtgccdir} -lt 6 ]; then
-   echo -e "\033[31m""  -----not found gccdir: so exit""\033[0m"
-   exit 1
-fi
 
 
-if [ "$#" -lt 1 ]; then
-	echo "没有输入"
-	echo "$1"
-	exit
-fi
-
 QtPlatformdir=$Qtgccdir/plugins/platforms
-QtLibDir=$Qtgccdir/lib
+#QtLibDir=$Qtgccdir/lib
 
 ignore_lib_name=(
 libstdc++.so.*

src/tool/tool_electronic_fence/mainwindow.cpp

@@ -101,15 +101,18 @@ void MainWindow::onTimer()
     GaussProjCal(gps_data_set.gps_lng, gps_data_set.gps_lat, &gps_data_set.gps_x, &gps_data_set.gps_y);
     GaussProjCal(gps_data_car.gps_lng, gps_data_car.gps_lat, &gps_data_car.gps_x, &gps_data_car.gps_y);
     double distance = GetDistance(gps_data_set,gps_data_car);
-    ui->lineEdit_6->setText(QString::number(distance, 'g', 12));
+    ui->lineEdit_6->setText(QString::number(distance, 'g', 7));
 
     std::cout<<set_R<<std::endl;
     std::cout<<distance<<std::endl;
 
     if(distance < set_R)
-        ui->textEdit->setPlainText("车辆中心点在电子栅栏以内");
+        ui->textEdit->append("<font color=\"#0000FF\">车辆中心点在电子栅栏以内</font> ");
+       // ui->textEdit->setPlainText("车辆中心点在电子栅栏以内");
     if(distance == set_R)
         ui->textEdit->setPlainText("车辆中心点在电子栅栏之上");
     if(distance > set_R)
-        ui->textEdit->setPlainText("车辆中心点在电子栅栏以外");
+       // ui->textEdit->setPlainText("车辆中心点在电子栅栏以外");
+        ui->textEdit->append("<font color=\"#FF0000\">车辆中心点在电子栅栏以外</font> ");
+
 }