Add layer time reporting to sendLayerComplete

Extended the sendLayerComplete method to include the time taken to print each layer. Updated the LayerOptimized protobuf message, relevant communication classes, and associated tests to support and verify this new parameter.

Author: HellAholic

Cura.proto

@@ -105,8 +105,9 @@ message LayerOptimized {
     int32 id = 1;
     float height = 2; // Z position
     float thickness = 3; // height of a single layer
+    float layer_time = 4; // time to print this layer in seconds
 
-    repeated PathSegment path_segment = 4; // layer data
+    repeated PathSegment path_segment = 5; // layer data
 }
 
 

include/communication/ArcusCommunication.h

@@ -118,8 +118,9 @@ class ArcusCommunication : public Communication
      * \param layer_nr The layer that was completed.
      * \param z The z-coordinate of the top side of the layer.
      * \param thickness The thickness of the layer.
+     * \param layer_time The time it took to print this layer in seconds.
      */
-    void sendLayerComplete(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness) override;
+    void sendLayerComplete(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness, const Duration& layer_time) override;
 
     /*
      * \brief Send a line to the front-end to display in layer view.

include/communication/CommandLine.h

@@ -93,7 +93,7 @@ class CommandLine : public Communication
      * The command line doesn't do anything with that information so this is
      * ignored.
      */
-    void sendLayerComplete(const LayerIndex::value_type&, const coord_t&, const coord_t&) override;
+    void sendLayerComplete(const LayerIndex::value_type&, const coord_t&, const coord_t&, const Duration&) override;
 
     /*
      * \brief Send a line for display.

include/communication/Communication.h

@@ -5,6 +5,7 @@
 #define COMMUNICATION_H
 
 #include "geometry/Point2LL.h"
+#include "settings/types/Duration.h"
 #include "settings/types/LayerIndex.h"
 #include "settings/types/Velocity.h"
 
@@ -61,8 +62,9 @@ class Communication
      * \param layer_nr The layer that was completed.
      * \param z The z-coordinate of the top side of the layer.
      * \param thickness The thickness of the layer.
+     * \param layer_time The time it took to print this layer in seconds.
      */
-    virtual void sendLayerComplete(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness) = 0;
+    virtual void sendLayerComplete(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness, const Duration& layer_time) = 0;
 
     /*
      * \brief Send a line to the user to visualise.

src/LayerPlan.cpp

@@ -3874,8 +3874,13 @@ void LayerPlan::writeGCode(GCodeExport& gcode)
             scripta::CellVDI{ "extrusion_mm3_per_mm", &GCodePath::getExtrusionMM3perMM });
     } // extruder plans /\  .
 
-    communication->sendLayerComplete(layer_nr_, z_, layer_thickness_);
+    // Calculate layer time before updating total print time
+    const Duration time_before = gcode.getSumTotalPrintTimes();
     gcode.updateTotalPrintTime();
+    const Duration time_after = gcode.getSumTotalPrintTimes();
+    const Duration layer_time = time_after - time_before;
+    
+    communication->sendLayerComplete(layer_nr_, z_, layer_thickness_, layer_time);
 }
 
 void LayerPlan::overrideFanSpeeds(double speed)

src/communication/ArcusCommunication.cpp

@@ -372,11 +372,12 @@ void ArcusCommunication::sendFinishedSlicing() const
     spdlog::debug("Sent slicing finished message.");
 }
 
-void ArcusCommunication::sendLayerComplete(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness)
+void ArcusCommunication::sendLayerComplete(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness, const Duration& layer_time)
 {
     std::shared_ptr<proto::LayerOptimized> layer = private_data->getOptimizedLayerById(layer_nr);
     layer->set_height(z);
     layer->set_thickness(thickness);
+    layer->set_layer_time(layer_time);
 }
 
 void ArcusCommunication::sendLineTo(const PrintFeatureType& type, const Point3LL& to, const coord_t& line_width, const coord_t& line_thickness, const Velocity& velocity)

src/communication/CommandLine.cpp

@@ -58,7 +58,7 @@ void CommandLine::sendCurrentPosition(const Point3LL&)
 void CommandLine::sendFinishedSlicing() const
 {
 }
-void CommandLine::sendLayerComplete(const LayerIndex::value_type&, const coord_t&, const coord_t&)
+void CommandLine::sendLayerComplete(const LayerIndex::value_type&, const coord_t&, const coord_t&, const Duration&)
 {
 }
 void CommandLine::sendLineTo(const PrintFeatureType&, const Point3LL&, const coord_t&, const coord_t&, const Velocity&)

tests/arcus/ArcusCommunicationTest.cpp

@@ -153,11 +153,13 @@ TEST_F(ArcusCommunicationTest, SendLayerComplete)
     const LayerIndex layer_nr = 10;
     constexpr coord_t layer_z = 20;
     constexpr coord_t layer_thickness = 30;
-    ac->sendLayerComplete(layer_nr, layer_z, layer_thickness);
+    constexpr Duration layer_time = 40.0;
+    ac->sendLayerComplete(layer_nr, layer_z, layer_thickness, layer_time);
     const std::shared_ptr<proto::LayerOptimized> message = ac->private_data->getOptimizedLayerById(layer_nr);
     EXPECT_EQ(static_cast<google::protobuf::int32>(layer_nr), message->id()) << "getOptimizedLayerById() must return a layer with the correct ID.";
     EXPECT_EQ(static_cast<float>(layer_z), message->height());
     EXPECT_EQ(static_cast<float>(layer_thickness), message->thickness());
+    EXPECT_EQ(static_cast<float>(layer_time), message->layer_time());
 }
 
 TEST_F(ArcusCommunicationTest, SendProgress)

tests/arcus/MockCommunication.h

@@ -24,7 +24,7 @@ class MockCommunication : public Communication
     MOCK_CONST_METHOD0(hasSlice, bool());
     MOCK_CONST_METHOD0(isSequential, bool());
     MOCK_CONST_METHOD1(sendProgress, void(double progress));
-    MOCK_METHOD3(sendLayerComplete, void(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness));
+    MOCK_METHOD4(sendLayerComplete, void(const LayerIndex::value_type& layer_nr, const coord_t& z, const coord_t& thickness, const Duration& layer_time));
     MOCK_METHOD5(sendLineTo, void(const PrintFeatureType& type, const Point3LL& to, const coord_t& line_width, const coord_t& line_thickness, const Velocity& velocity));
     MOCK_METHOD1(sendCurrentPosition, void(const Point3LL& position));
     MOCK_METHOD1(setExtruderForSend, void(const ExtruderTrain& extruder));