the buttons call start and stop simulator. The simulator can only run…

… if it is in simulation mode. Renamed reset to stop simulator.

src/mainwindow/mainwindow_menu.cpp

@@ -1130,11 +1130,11 @@ void MainWindow::createViewMenuActions(bool showWelcome) {
 
 	m_startSimulatorAct = new QAction(tr("Start Simulator"), this);
 	m_startSimulatorAct->setStatusTip(tr("Starts the simulator (DC analysis)"));
-	connect(m_startSimulatorAct, SIGNAL(triggered()), m_simulator, SLOT(simulate()));
+	connect(m_startSimulatorAct, SIGNAL(triggered()), m_simulator, SLOT(startSimulation()));
 
 	m_stopSimulatorAct = new QAction(tr("Stop Simulator"), this);
 	m_stopSimulatorAct->setStatusTip(tr("Stops the simulator and removes simulator data"));
-	connect(m_stopSimulatorAct, SIGNAL(triggered()), m_simulator, SLOT(reset()));
+	connect(m_stopSimulatorAct, SIGNAL(triggered()), m_simulator, SLOT(stopSimulation()));
 
 	m_showGridAct = new QAction(tr("Show Grid"), this);
 	m_showGridAct->setStatusTip(tr("Show the grid"));

src/simulation/simulator.cpp

@@ -159,10 +159,22 @@ void Simulator::enable(bool enable) {
 }
 
 /**
- * Resets the simulator and removes the simulation effects: the grey out of
- * the parts that are not simulated and the messages previously added.
+ * This function starts the simulator and triggers a simulation. Once the simulator has
+ * been started, the simulaton will run after any user actions that modifies the circuit
+ * (adding wires, parts, modifying property values, etc.)
+ */
+void Simulator::startSimulation()
+{
+	simulating = true;
+	simulate();
+}
+
+/**
+ * Stops the simulator (the simulator will not run if the user modifies the circuit) and
+ * removes the simulation effects: the grey out effects on the parts that are not being,
+ * simulated, the smoke images, and the messages on the multimeter.
  */
-void Simulator::reset() {
+void Simulator::stopSimulation() {
 	simulating = false;
 	removeSimItems();
 }
@@ -187,8 +199,8 @@ void Simulator::reset() {
  * @brief Simulate the current circuit and check for components working out of specifications
  */
 void Simulator::simulate() {
-	if (!m_enabled) {
-		std::cout << "The simulator is not enabled" << std::endl;
+	if (!m_enabled || !simulating) {
+		std::cout << "The simulator is not enabled or simulating" << std::endl;
 		return;
 	}
 
@@ -199,8 +211,6 @@ void Simulator::simulate() {
 		return;
 	}
 
-	simulating = true;
-
 	//Empty the stderr and stdout buffers
 	m_simulator->ResetStdOutErr();
 
@@ -292,7 +302,7 @@ void Simulator::simulate() {
 	std::cout << "Waiting for simulator thread to stop" <<std::endl;
 	int elapsedTime = 0, simTimeOut = 3000; // in ms
 	while (m_simulator->IsRunning() && elapsedTime < simTimeOut) {
-		QThread::msleep(1000);
+		QThread::usleep(1000);
 		elapsedTime++;
 	}
 	if (elapsedTime >= simTimeOut) {

src/simulation/simulator.h

@@ -37,15 +37,16 @@ class Simulator : public QObject
 	~Simulator();
 	bool isEnabled();
 	static bool isSimulating();
+	static void triggerSimulation();
+	void simulate();
 
 private:
 	void resetTimer();
 
 public slots:
 	void enable(bool);
-	void reset();
-	void simulate();
-	static void triggerSimulation();
+	void stopSimulation();
+	void startSimulation();
 
 protected:	
 	void drawSmoke(ItemBase* part);