Loading and Sending implemented, found a bug with files that are csv …

…but have a wrong format that should be discussed further
skunkforce · Oct 3, 2024 · e914882 · e914882
1 parent 81eb600
commit e914882
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/analyze_data.cpp b/src/analyze_data.cpp
@@ -33,6 +33,12 @@ void generate_analyze_menu( // generate the whole menu: Startpoint
   if(ImGui::Button(appLanguage[Key::Send])){
     stateManager.loadAndSendData(captureData); // One function because of the loading bar 
   }
+  if(stateManager.getState() == State::DATAISSENDING){ // waiting for API response
+    stateManager.whileSendingProcess(); 
+  } 
+  // PopUp With API Message: temporary 
+  info_popup(appLanguage[Key::Data_upload],
+              appLanguage[Key::Upload_failure]);
   }
   ImGui::EndPopup();
 }
@@ -122,32 +128,13 @@ void AnalyzeStateManager::loadAndSendData( const std::map<Omniscope::Id, std::ve
   if(currentState != State::DATAISSENDING){ // start asynch task to load data 
     loadedDataJSON["meta"] = {}; 
     loadedDataJSON["data"] = {{"sampling_rate", 100000}, {"y_values", loadedData}}; 
-    std::cout << "File was transformed to JSON" << std::endl; 
     future = std::async(std::launch::async, [&] {
           // take temp object returned from dump() and send it to sendData
           std::string result = sendData(loadedDataJSON.dump());
           return result;
         });
-    std::cout << "This works" << std::endl;
     currentState = State::DATAISSENDING; 
   }
-  if(currentState == State::DATAISSENDING){ // waiting for API response
-    auto status = future.wait_for(std::chrono::milliseconds(10));
-    if(status == std::future_status::ready){
-      std::cout << "message was send" << std::endl;
-      ImGui::OpenPopup(appLanguage[Key::Data_upload],
-                         ImGuiPopupFlags_NoOpenOverExistingPopup);
-      loadedDataJSON.clear(); 
-      currentState = State::DATAWASSEND;  
-    }
-    else {
-      ImGui::SameLine();
-        ImGui::Text(" sending ... %c",
-                    "|/-\\"[(int)(ImGui::GetTime() / 0.05f) & 3]);
-    }
-  } 
-  info_popup(appLanguage[Key::Data_upload],
-              appLanguage[Key::Upload_failure]);
   //sendData() from sendData.hpp on the Json.dump() output needs enableAllOtherFields(); after api_message is received is finished
 }
 
@@ -187,7 +174,6 @@ std::vector<double> AnalyzeStateManager::loadData(const std::map<Omniscope::Id,
         }
     y_values.pop_back(); // pop last element
     currentState = State::FILEDATALOADED; 
-    std::cout << "File was loaded" << std::endl; 
    }
  }
  return y_values; 
@@ -216,17 +202,30 @@ void AnalyzeStateManager::selectCurrentDevice(const std::map<Omniscope::Id, std:
       if(DeviceChecked){
       selectedDeviceId = deviceId; 
       currentState = State::CURRENTDATASELECTED;
-      std::cout << "Device selected:" << deviceId.serial.c_str() << std::endl;
       }
       else {
       selectedDeviceId = {}; 
       currentState = State::CURRENTDATAWANTED;
-      std::cout << "Device Changed:" << deviceId.serial.c_str() << std::endl; 
       }
     }
   }
 }
 
+void AnalyzeStateManager::whileSendingProcess(){
+  auto status = future.wait_for(std::chrono::milliseconds(10));
+    if(status == std::future_status::ready){
+      ImGui::OpenPopup(appLanguage[Key::Data_upload],
+                         ImGuiPopupFlags_NoOpenOverExistingPopup);
+      loadedDataJSON.clear(); 
+      currentState = State::DATAWASSEND;  
+    }
+    else {
+      ImGui::SameLine();
+        ImGui::Text(" sending ... %c",
+                    "|/-\\"[(int)(ImGui::GetTime() / 0.05f) & 3]);
+    }
+}
+
 void AnalyzeStateManager::writeAnalysisAnswerIntoFile() {
   std::cout << "Not used" << std::endl;
 }
diff --git a/src/analyze_data.hpp b/src/analyze_data.hpp
@@ -62,6 +62,7 @@ class AnalyzeStateManager {
   // extra functions:
 
   void selectCurrentDevice(const std::map<Omniscope::Id, std::vector<std::pair<double, double>>> &);
+  void whileSendingProcess(); 
 
   void writeAnalysisAnswerIntoFile();