Remove usused sender state and related signals

Author: etet100

src/gpilot/core/communicator/communicator.cpp

@@ -135,7 +135,6 @@ Communicator::Communicator(
     connect(&m_stateBehaviorTransitionTimer, &QTimer::timeout, this, &Communicator::processStateBehaviorTransition);
     m_stateBehaviorTransitionTimer.start(1000);
 
-    setSenderStateAndEmitSignal(SenderState::Stopped);
 }
 
 Communicator::~Communicator()
@@ -153,7 +152,6 @@ void Communicator::deinit()
 void Communicator::resetStateVariables()
 {
     m_machineState = MachineState::Unknown;
-    m_senderState = SenderState::Unknown;
     if (m_posTracker) m_posTracker->reset();
     m_deviceContext.reset();
 }
@@ -350,16 +348,6 @@ AbstractConnection *Communicator::connection()
     return m_connection;
 }
 
-void Communicator::setSenderStateAndEmitSignal(SenderState state)
-{
-    if (m_senderState != state) {
-        m_senderState = state;
-        emit senderStateChanged(state);
-    }
-
-    emit senderStateReceived(state);
-}
-
 void Communicator::setMachineStateAndEmitSignal(MachineState state)
 {
     if (m_machineState != state) {
@@ -373,11 +361,6 @@ bool Communicator::isMachineConfigurationReady() const
     return m_deviceContext.hasPhysicalConfig();
 }
 
-bool Communicator::isSenderState(SenderState state) const
-{
-    return m_senderState == state;
-}
-
 // void Communicator::probe()
 // {
 //     m_sbManager.current()->action(Action::Probe);
@@ -412,7 +395,6 @@ void Communicator::restoreParserState()
 
 void Communicator::completeTransfer()
 {
-    setSenderStateAndEmitSignal(SenderState::Stopped);
     m_storedParserState.clear();
 
     if (m_configuration->senderModule().useProgramEndCommands())
@@ -496,4 +478,3 @@ void Communicator::stopQueryingMachineState()
         m_queryMachineStateTimer = nullptr;
     }
 }
-

src/gpilot/core/communicator/communicator.h

@@ -56,7 +56,6 @@ class Communicator : public QObject
         AbstractConnection* connection();
         // void stopUpdatingState();
         // void startUpdatingState(int interval = -1);
-        const SenderState& senderState() const { return m_senderState; }
         const MachineState& machineState() const { return m_machineState; }
         DeviceContext& deviceContext() { return m_deviceContext; }
         const DeviceContext& deviceContext() const { return m_deviceContext; }
@@ -65,11 +64,6 @@ class Communicator : public QObject
         PositionTracker* positionTracker() { return m_posTracker; }
         // void sendStreamerCommandsUntilBufferIsFull();
         bool isMachineConfigurationReady() const;
-        bool isSenderState(SenderState state) const;
-        template<typename... Args>
-        bool isSenderState(SenderState state, Args... args) const {
-            return isSenderState(state) || isSenderState(args...);
-        }
 
         Overrides* overrides() { return m_overrides; }
         CommandBuffer* commandBuffer() { return m_commandBuffer; }
@@ -95,7 +89,6 @@ class Communicator : public QObject
         CommunicatorApi *m_comApi;
 
         // States
-        SenderState m_senderState;
         MachineState m_machineState;
         StateBehaviorManager m_sbManager;
 
@@ -128,7 +121,6 @@ class Communicator : public QObject
         int m_lastAlarmCode = 0;
 
         bool execute(AbstractStateBehavior *statebehavior, bool force = false);
-        void setSenderStateAndEmitSignal(SenderState);
         void setMachineStateAndEmitSignal(MachineState);
         void processOffsetsVars(QStringList response);
         static bool dataIsFloating(QString data);
@@ -165,8 +157,6 @@ class Communicator : public QObject
         void connectionStateChanged(ConnectionState state);
         void alarm(int code);
         void welcomeMessageReceived(QString message);
-        void senderStateReceived(SenderState state);
-        void senderStateChanged(SenderState state);
         void machineStateChanged(MachineState state);
         void machineStatusReportReceived(MachineStatusReport report);
         void machineConfigurationReceived(PhysicalMachineConfiguration configuration);

src/gpilot/core/communicator/communicator_processing_response.cpp

@@ -209,13 +209,6 @@ void Communicator::processMachineState(MachineState state)
     //     ui->glwVisualizer->setSpendTime(time.addMSecs(elapsed));
     // }
 
-    // Test for job complete
-    if ((m_senderState == SenderState::Stopping) &&
-        ((state == MachineState::Idle && m_machineState == MachineState::Run) || state == MachineState::Check))
-    {
-        completeTransfer();
-    }
-
     // Abort
     static double x = sNan;
     static double y = sNan;
@@ -359,11 +352,6 @@ void Communicator::processGCodeParserState(CommandAttributes commandAttributes,
             // Update status in visualizer window
             emit parserStateReceived(modal->raw);
 
-            // Store parser status
-            if ((m_senderState == SenderState::Transferring) || (m_senderState == SenderState::Stopping)) {
-                storeParserState();
-            }
-
             if (modal->spindleSpeed != -1) {
                 emit spindleSpeedReceived(modal->spindleSpeed);
             }
@@ -751,7 +739,6 @@ void Communicator::processWelcomeMessageDetected(QString message)
     return;
     emit welcomeMessageReceived(message);
 
-    setSenderStateAndEmitSignal(SenderState::Stopped);
     setMachineStateAndEmitSignal(MachineState::Unknown);
 
     // m_streamer->reset();
@@ -768,9 +755,6 @@ void Communicator::processWelcomeMessageDetected(QString message)
     // sendCommand(CommandSource::System, "$$", TABLE_INDEX_UTIL1);
     // sendCommand(CommandSource::System, "$#", TABLE_INDEX_UTIL1, true);
 
-    // @TODO moved to senderStateReceived handler, is it too soon??
-    // m_form->updateControlsState();
-
 }
 
 void Communicator::processMessage(QString data)

src/gpilot/core/globals.h

@@ -222,17 +222,6 @@ enum class JoggindDir {
 
 typedef QVector3D JoggingVector;
 
-enum class SenderState {
-    Unknown = -1,
-    Transferring = 0,
-    Pausing = 1,
-    Paused = 2,
-    Stopping = 3,
-    Stopped = 4,
-    ChangingTool = 5,
-    Pausing2 = 6
-};
-
 enum class MachineState : int {
     Unknown = 0,
     Idle = 1,

src/gpilot/ui/forms/frmmain.cpp

@@ -207,7 +207,6 @@ void FrmMain::initializeCommunicator()
         ui->state->setMachineStateReport(report.toMarkdown());
     });
     connect(communicator(), &Communicator::machineStateChanged, this, &FrmMain::onMachineStateChanged);
-    connect(communicator(), &Communicator::senderStateReceived, this, &FrmMain::onSenderStateReceived);
     connect(communicator(), SIGNAL(spindleStateReceived(bool)), this, SLOT(onSpindleStateReceived(bool)));
     connect(communicator(), &Communicator::floodStateReceived, this, &FrmMain::onFloodStateReceived);
     connect(communicator(), &Communicator::commandSent, this, &FrmMain::onCommandSent);
@@ -1894,13 +1893,6 @@ void FrmMain::onMachineStateReceived(MachineState state)
     updateControlsState();
 }
 
-void FrmMain::onSenderStateReceived(SenderState state)
-{
-    Q_UNUSED(state);
-
-    updateControlsState();
-}
-
 void FrmMain::onSpindleStateReceived(bool state)
 {
     // @TODO Pass spindle state to visualizator

src/gpilot/ui/forms/frmmain.h

@@ -149,7 +149,6 @@ private slots:
     void onWorkPosChanged(QVector3D pos);
     void onMachineStateChanged(MachineState state);
     void onMachineStateReceived(MachineState state);
-    void onSenderStateReceived(SenderState state);
     void onSpindleStateReceived(bool state);
     void onFloodStateReceived(bool state);
     void onParserStateReceived(QString state);