Completed conversion to libkovanserial

CMakeLists.txt

@@ -68,6 +68,8 @@ QT4_ADD_RESOURCES(KISS_SRCS_CXX ${KISS_QRC_FILES})
 
 SET(CMAKE_CXX_FLAGS "-Wall")
 
+ADD_DEFINITIONS(-DQT_SHAREDPOINTER_TRACK_POINTERS)
+
 IF(APPLE)
 	SET(CMAKE_OSX_SYSROOT "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.6.sdk")
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64 -g")

include/build_options.hpp

@@ -11,7 +11,7 @@
 
 
 // This option will enable GUI logging. Disables console output as a side-effect
-#define ENABLE_LOG_WINDOW
+// #define ENABLE_LOG_WINDOW
 
 #ifndef QT_PHONON_LIB
 #undef BUILD_AUDIO_TUTORIAL

include/dialogs/manual_target_dialog.hpp

@@ -0,0 +1,38 @@
+#ifndef _MANUAL_TARGET_SELECTOR_HPP_
+#define _MANUAL_TARGET_SELECTOR_HPP_
+
+#include <QDialog>
+
+#include "target.hpp"
+
+namespace Ui
+{
+	class ManualTargetDialog;
+}
+
+namespace Kiss
+{
+	namespace Target
+	{
+		class InterfaceModel;
+	}
+
+	namespace Dialog
+	{
+		class ManualTarget : public QDialog
+		{
+		Q_OBJECT
+		public:
+			ManualTarget(QWidget *parent = 0);
+			~ManualTarget();
+
+			Kiss::Target::TargetPtr target() const;
+
+		private:
+			Ui::ManualTargetDialog *ui;
+			Kiss::Target::InterfaceModel *m_model;
+		};
+	}
+}
+
+#endif

include/dialogs/target_dialog.hpp

@@ -47,11 +47,13 @@ namespace Kiss
 			void targetChosen(const QModelIndex& index);
 			void on_ui_interfaces_currentIndexChanged(int index);
 			void on_ui_refresh_clicked();
+			void on_ui_manual_clicked();
 
 		private:
 			Kiss::Target::InterfaceManager *m_manager;
 			Kiss::Target::TargetModel m_model;
 			Kiss::Target::InterfaceModel m_interfaceModel;
+			Kiss::Target::TargetPtr m_manualTarget;
 		};
 	}
 }

include/external_tools.hpp

@@ -0,0 +1,23 @@
+#ifndef _EXTERNAL_TOOLS_HPP_
+#define _EXTERNAL_TOOLS_HPP_
+
+#include <QString>
+#include <QSettings>
+
+namespace Kiss
+{
+	class ExternalTools
+	{
+	public:
+		void setTool(const QString &name, const QString &path);
+		QString tool(const QString &name);
+		void removeTool(const QString &name);
+
+		bool launch(const QString &name);
+
+	private:
+		QSettings m_settings;
+	};
+}
+
+#endif

include/interface/communication_manager.hpp

@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include <QRunnable>
+#include <QMutex>
 
 #include "singleton.hpp"
 #include "communication_queue.hpp"
@@ -13,20 +14,22 @@ namespace Kiss
 	{
 		class CommunicationWorker : public QObject, public QRunnable
 		{
+		Q_OBJECT
 		public:
 			CommunicationWorker(const CommunicationEntryPtr &entry);
 			virtual void run();
 
 		signals:
 			void progress(const CommunicationEntryPtr &entry);
-			void finished(const CommunicationEntryPtr &entry);
+			void finished(const CommunicationEntryPtr &entry, const bool &success);
 
 		private:
 			CommunicationEntryPtr m_entry;
 		};
 
 		class CommunicationManager : public QObject, public Singleton<CommunicationManager>
 		{
+		Q_OBJECT
 		public:
 			CommunicationManager();
 			~CommunicationManager();
@@ -36,17 +39,19 @@ namespace Kiss
 		signals:
 			void admitted(const CommunicationEntryPtr &entry);
 			void began(const CommunicationEntryPtr &entry);
-			void progress(const CommunicationEntryPtr &entry, const double &fraction);
-			void finished(const CommunicationEntryPtr &entry);
+			void progress(const CommunicationEntryPtr &entry, double fraction);
+			void finished(const CommunicationEntryPtr &entry, bool success);
+			void queueFinished();
 
 		private slots:
 			void saturate();
-			void workerFinished(const CommunicationEntryPtr &entry);
+			void workerFinished(CommunicationEntryPtr entry, const bool &success);
 
 		private:
 			quint64 m_id;
 			QList<CommunicationEntryPtr> m_running;
 			CommunicationQueue m_queue;
+			QMutex m_queueMutex;
 		};
 	}
 }

include/interface/communication_queue.hpp

@@ -1,5 +1,5 @@
-#ifndef _COMMUNICATIONQUEUE_H_
-#define _COMMUNICATIONQUEUE_H_
+#ifndef _COMMUNICATION_QUEUE_HPP_
+#define _COMMUNICATION_QUEUE_HPP_
 
 #include "target.hpp"
 
@@ -9,6 +9,7 @@
 #include <QString>
 #include <QByteArray>
 #include <QSharedPointer>
+#include <QMetaType>
 
 namespace Kiss
 {
@@ -36,6 +37,7 @@ namespace Kiss
 
 			const TargetPtr &target() const;
 			const CommunicationEntry::Type& type() const;
+			QString typeString() const;
 			const QString& custom() const;
 			const QByteArray& payload() const;
 			const QString& name() const;
@@ -64,4 +66,6 @@ namespace Kiss
 	}
 }
 
+Q_DECLARE_METATYPE(Kiss::Target::CommunicationEntryPtr);
+
 #endif

include/interface/communication_queue_model.hpp

@@ -0,0 +1,36 @@
+#ifndef _COMMUNICATION_QUEUE_MODEL_HPP_
+#define _COMMUNICATION_QUEUE_MODEL_HPP_
+
+#include "communication_queue.hpp"
+
+#include <QStandardItemModel>
+
+namespace Kiss
+{
+	namespace Target
+	{
+		class CommunicationManager;
+
+		class CommunicationQueueModel : public QStandardItemModel
+		{
+		Q_OBJECT
+		public:
+			CommunicationQueueModel(CommunicationManager *manager, QObject *parent);
+			~CommunicationQueueModel();
+
+			CommunicationManager *manager() const;
+
+		private slots:
+			void admitted(const CommunicationEntryPtr &entry);
+			void began(const CommunicationEntryPtr &entry);
+			void progress(const CommunicationEntryPtr &entry, double success);
+			void finished(const CommunicationEntryPtr &entry, bool success);
+			void queueFinished();
+
+		private:
+			CommunicationManager *m_manager;
+		};
+	}
+}
+
+#endif

include/interface/dummy_interface.hpp

@@ -16,6 +16,7 @@ namespace Kiss
 		public:
 			DummyInterface();
 
+			virtual Kiss::Target::TargetPtr createTarget(const QString &address);
 			virtual const bool scan(Kiss::Target::InterfaceResponder *responder);
 			virtual void invalidateResponder();
 		};

include/interface/interface.hpp

@@ -2,6 +2,7 @@
 #define _INTERFACE_HPP_
 
 #include "interface_responder.hpp"
+#include "target.hpp"
 
 #include <QList>
 #include <QString>
@@ -16,7 +17,8 @@ namespace Kiss
 			Interface(const QString& name);
 
 			const QString& name() const;
-
+
+			virtual Kiss::Target::TargetPtr createTarget(const QString &address) = 0;
 			virtual const bool scan(InterfaceResponder *responder) = 0;
 			virtual void invalidateResponder() = 0;
 		private:

include/interface/interface_model.hpp

@@ -14,10 +14,10 @@ namespace Kiss
 		{
 		Q_OBJECT
 		public:
-			InterfaceModel(InterfaceManager *manager);
+			InterfaceModel(InterfaceManager *manager, QObject *parent = 0);
 
-			Interface* rowToInterface(const int& row) const;
-			Interface* indexToInterface(const QModelIndex& index) const;
+			Interface *rowToInterface(const int& row) const;
+			Interface *indexToInterface(const QModelIndex& index) const;
 
 			void setAllInterface(const bool& on);
 

include/interface/main_responder.hpp

@@ -0,0 +1,29 @@
+#ifndef _MAIN_RESPONDER_HPP_
+#define _MAIN_RESPONDER_HPP_
+
+#include "target_responder.hpp"
+
+namespace Kiss
+{
+	namespace Widget
+	{
+		class MainWindow;
+	}
+
+	namespace Target
+	{
+		class MainResponder : public Responder
+		{
+		public:
+			MainResponder(Widget::MainWindow *mainWindow);
+			virtual ~MainResponder();
+
+			virtual void response(Target *target, const Response &response);
+
+		private:
+			Widget::MainWindow *m_mainWindow;
+		};
+	}
+}
+
+#endif