Jelajahi Sumber

0505 修正矢量图传输数据问题

caizm 2 tahun lalu
induk
melakukan
2ff4cb72ed

+ 2 - 2
CAE_Solution/conf/conf_recv.txt

@@ -4,6 +4,6 @@ userName:admin
 password:admin
 
 channel_id:1
-queue_name:BLOCKcaeint
+queue_name:BLOCKcaein
 exchange_name:BLOCKMQ-EXCHANGE
-keys_name:caeint
+keys_name:caein

+ 2 - 2
CAE_Solution/conf/conf_send.txt

@@ -4,6 +4,6 @@ userName:admin
 password:admin
 
 channel_id:1
-queue_name:BLOCKcaeoutt
+queue_name:BLOCKcaeout
 exchange_name:BLOCKMQ-EXCHANGE
-keys_name:caeoutt
+keys_name:caeout

+ 22 - 28
CAE_Solution/src/VTK/widget/solidsurfaceDisplaywidget.cpp

@@ -15,7 +15,7 @@ SolidSurfaceWidget::SolidSurfaceWidget()
 * @date 20230104
 */
 {
-
+    showHideState = true;
 }
 
 /**
@@ -29,9 +29,9 @@ SolidSurfaceWidget::SolidSurfaceWidget()
  */
 void SolidSurfaceWidget::Setcolor(QColor color)
 {
-//   ldt_r->setText(QString::number(color.red()/255.0));
-//   ldt_g->setText(QString::number(color.green()/255.0));
-//   ldt_b->setText(QString::number(color.blue()/255.0));
+    //   ldt_r->setText(QString::number(color.red()/255.0));
+    //   ldt_g->setText(QString::number(color.green()/255.0));
+    //   ldt_b->setText(QString::number(color.blue()/255.0));
     number_r = color.red()/255.0;
     number_g = color.green()/255.0;
     number_b = color.blue()/255.0;
@@ -49,9 +49,9 @@ void SolidSurfaceWidget::Setcolor(QColor color)
 vector<double> SolidSurfaceWidget::GetColor()
 {
     vector<double> vec;
-//    vec.push_back(ldt_r->text().toDouble());
-//    vec.push_back(ldt_g->text().toDouble());
-//    vec.push_back(ldt_b->text().toDouble());
+    //    vec.push_back(ldt_r->text().toDouble());
+    //    vec.push_back(ldt_g->text().toDouble());
+    //    vec.push_back(ldt_b->text().toDouble());
     vec.push_back(number_r);
     vec.push_back(number_g);
     vec.push_back(number_b);
@@ -68,9 +68,9 @@ vector<double> SolidSurfaceWidget::GetColor()
  */
 void SolidSurfaceWidget::SetColor(vector<double> color)
 {
-//    ldt_r->setText(QString::number(color.at(0)));
-//    ldt_g->setText(QString::number(color.at(1)));
-//    ldt_b->setText(QString::number(color.at(2)));
+    //    ldt_r->setText(QString::number(color.at(0)));
+    //    ldt_g->setText(QString::number(color.at(1)));
+    //    ldt_b->setText(QString::number(color.at(2)));
     number_r = color.at(0);
     number_g = color.at(1);
     number_b = color.at(2);
@@ -86,7 +86,7 @@ void SolidSurfaceWidget::SetColor(vector<double> color)
  */
 void SolidSurfaceWidget::SetTransparency(double value)
 {
-//    ldt_trans->setText(QString::number(value));
+    //    ldt_trans->setText(QString::number(value));
     number_transparency = value;
 }
 
@@ -102,9 +102,9 @@ void SolidSurfaceWidget::SetTransparency(double value)
  */
 double SolidSurfaceWidget::GetTransparency()
 {
-//    double value = ldt_trans->text().toDouble();
+    //    double value = ldt_trans->text().toDouble();
 
-//    return value;
+    //    return value;
     return number_transparency;
 }
 
@@ -119,13 +119,13 @@ double SolidSurfaceWidget::GetTransparency()
  */
 bool SolidSurfaceWidget::GetShowHideState()
 {
-//    if (rbt_show->isChecked())
-//    {
-        return true;
-//    }else
-//    {
-//        return false;
-//    }
+    //    if (rbt_show->isChecked())
+    //    {
+    return showHideState;
+    //    }else
+    //    {
+    //        return false;
+    //    }
 }
 /**
  * @brief the destructor.
@@ -138,7 +138,7 @@ bool SolidSurfaceWidget::GetShowHideState()
  */
 SolidSurfaceWidget::~SolidSurfaceWidget()
 {
-
+    showHideState = true;
 }
 /**
  * @brief
@@ -151,12 +151,6 @@ SolidSurfaceWidget::~SolidSurfaceWidget()
  */
 void SolidSurfaceWidget::SetShowHideState(bool flag)
 {
-//    if(flag)
-//    {
-//        rbt_hide->setChecked(true);
-//    }else
-//    {
-//        rbt_show->setChecked(true);
-//    }
+   showHideState = flag;
 }
 

+ 5 - 2
CAE_Solution/src/VTK/widget/solidsurfaceDisplaywidget.h

@@ -18,9 +18,12 @@ public:
     bool GetShowHideState();
     void SetShowHideState(bool flag);
 public:
-     double number_r;
+     double number_r;//代替窗口输入的rgb参数
      double number_g;
      double number_b;
-     double number_transparency;
+
+private:
+     bool showHideState; //true--show  false--hide
+     double number_transparency;//参数透明度
 };
 #endif // SOLIDSURFACEWIDGET_H

+ 9 - 8
CAE_Solution/src/threadPool_and_statemachine/dealWith/handlepool.cpp

@@ -169,8 +169,8 @@ void handlePool::judgeLoaddata(vtkJsonObject *object, QVTKRenderer *render_)
             render_->RemoveAllActors();
         }
     }
-    //QString m_filePath = object->filePath;//测试路径
-    QString m_filePath = "F:\\czm\\vtkfile\\tfg.ugrid";
+    QString m_filePath = object->filePath;//测试路径
+    //QString m_filePath = "F:\\czm\\vtkfile\\tfg.ugrid";
     QFileInfo fileinfo_(m_filePath);
     if(!fileinfo_.isFile()){
         cout<<"file path is Empty!"<<endl;
@@ -236,7 +236,7 @@ bool handlePool::resultImport(vtkJsonObject *object_, QVTKRenderer *renderer_)
             //            renderer_->RemoveAllActors();
         }
     }
-    object_->filePath = "C:\\Users\\Administrator\\Desktop\\Postprocess_Binary";//测试路径
+    //object_->filePath = "C:\\Users\\Administrator\\Desktop\\Postprocess_Binary";//测试路径
     QDir dir(object_->filePath);
     if(!dir.exists()){
         return false;
@@ -410,8 +410,9 @@ bool handlePool::result_vectordisplay(vtkJsonObject *object_, QVTKRenderer *rend
 QMap<QString,string> handlePool::buildResultImport_msg(QString type,ResultMeshManager *cmanager)
 {
     QMap<QString,string> map_tmp;
+    cmanager->SetNameTypeMap();
     if((type == "Line")||(type == "Contour")){
-        cmanager->SetNameTypeMap();
+
         map<string,int> map_ = cmanager->GetNameTypeMap();
         string msg;
         for(map<string,int>::iterator it=map_.begin();it!=map_.end();it++){
@@ -443,7 +444,7 @@ QMap<QString,string> handlePool::buildResultImport_msg(QString type,ResultMeshMa
         string msg;
         vector<string> vec_u = cmanager->vectorWidget_->dataU;
         for(int i = 0;i<vec_u.size();i++){
-            msg+=removeSpaces(vec_u[i]);
+            msg+=vec_u[i];
             msg+=",";
         }
         msg = msg.erase(msg.size()-1);
@@ -451,7 +452,7 @@ QMap<QString,string> handlePool::buildResultImport_msg(QString type,ResultMeshMa
         msg.clear();
         vector<string> vec_v = cmanager->vectorWidget_->dataV;
         for(int i =0;i<vec_v.size();i++){
-            msg+=removeSpaces(vec_v[i]);
+            msg+=vec_v[i];
             msg+=",";
         }
         msg = msg.erase(msg.size()-1);
@@ -459,14 +460,14 @@ QMap<QString,string> handlePool::buildResultImport_msg(QString type,ResultMeshMa
         msg.clear();
         vector<string> vec_w = cmanager->vectorWidget_->dataW;
         for(int i =0;i<vec_w.size();i++){
-            msg+=removeSpaces(vec_w[i]);
+            msg+=vec_w[i];
             msg+=",";
         }
         msg = msg.erase(msg.size()-1);
         map_tmp.insert("dataW",msg);
         msg.clear();
         msg = to_string(cmanager->vectorWidget_->current_scalefactor);
-        map_tmp.insert("ScaleFactor",msg);
+        map_tmp.insert("scaleFactor",msg);
         msg.clear();
     }
     return map_tmp;