Merge branch 'beta-merge'

i-score-old · Oct 11, 2014 · 0f0cba1 · 0f0cba1
2 parents 0510fc8 + bf4c5f0
commit 0f0cba1
Show file tree

Hide file tree

Showing 91 changed files with 7,275 additions and 2,971 deletions.
diff --git a/Examples/Jamoma_demo/patchers/MinuitInterface.maxpat b/Examples/Jamoma_demo/patchers/MinuitInterface.maxpat
diff --git a/Examples/Jamoma_demo/patchers/mediaPlayerMinuitDevice.maxpat b/Examples/Jamoma_demo/patchers/mediaPlayerMinuitDevice.maxpat
diff --git a/Examples/testOSClearn.maxpat b/Examples/testOSClearn.maxpat
@@ -0,0 +1,244 @@
+{
+	"patcher" : 	{
+		"fileversion" : 1,
+		"appversion" : 		{
+			"major" : 6,
+			"minor" : 1,
+			"revision" : 8,
+			"architecture" : "x64"
+		}
+,
+		"rect" : [ 0.0, 44.0, 355.0, 250.0 ],
+		"bglocked" : 0,
+		"openinpresentation" : 0,
+		"default_fontsize" : 12.0,
+		"default_fontface" : 0,
+		"default_fontname" : "Arial",
+		"gridonopen" : 0,
+		"gridsize" : [ 15.0, 15.0 ],
+		"gridsnaponopen" : 0,
+		"statusbarvisible" : 2,
+		"toolbarvisible" : 1,
+		"boxanimatetime" : 200,
+		"imprint" : 0,
+		"enablehscroll" : 1,
+		"enablevscroll" : 1,
+		"devicewidth" : 0.0,
+		"description" : "",
+		"digest" : "",
+		"tags" : "",
+		"boxes" : [ 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-1",
+					"maxclass" : "newobj",
+					"numinlets" : 1,
+					"numoutlets" : 0,
+					"patching_rect" : [ 221.0, 64.0, 100.0, 20.0 ],
+					"text" : "print OSC"
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-17",
+					"maxclass" : "flonum",
+					"numinlets" : 1,
+					"numoutlets" : 2,
+					"outlettype" : [ "float", "bang" ],
+					"parameter_enable" : 0,
+					"patching_rect" : [ 234.5, 105.0, 50.0, 20.0 ]
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-18",
+					"maxclass" : "message",
+					"numinlets" : 2,
+					"numoutlets" : 1,
+					"outlettype" : [ "" ],
+					"patching_rect" : [ 234.5, 136.0, 105.0, 18.0 ],
+					"text" : "/zede/ascacea $1"
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-16",
+					"maxclass" : "flonum",
+					"numinlets" : 1,
+					"numoutlets" : 2,
+					"outlettype" : [ "float", "bang" ],
+					"parameter_enable" : 0,
+					"patching_rect" : [ 138.5, 105.0, 50.0, 20.0 ]
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-15",
+					"maxclass" : "flonum",
+					"numinlets" : 1,
+					"numoutlets" : 2,
+					"outlettype" : [ "float", "bang" ],
+					"parameter_enable" : 0,
+					"patching_rect" : [ 42.5, 105.0, 50.0, 20.0 ]
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-13",
+					"maxclass" : "message",
+					"numinlets" : 2,
+					"numoutlets" : 1,
+					"outlettype" : [ "" ],
+					"patching_rect" : [ 138.5, 136.0, 83.0, 18.0 ],
+					"text" : "/krap/punk $1"
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-12",
+					"maxclass" : "message",
+					"numinlets" : 2,
+					"numoutlets" : 1,
+					"outlettype" : [ "" ],
+					"patching_rect" : [ 42.5, 136.0, 83.0, 18.0 ],
+					"text" : "/krap/ponk $1"
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-11",
+					"maxclass" : "newobj",
+					"numinlets" : 1,
+					"numoutlets" : 0,
+					"patching_rect" : [ 62.0, 176.0, 137.0, 20.0 ],
+					"text" : "udpsend localhost 9996"
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-10",
+					"maxclass" : "message",
+					"numinlets" : 2,
+					"numoutlets" : 1,
+					"outlettype" : [ "" ],
+					"patching_rect" : [ 42.5, 67.0, 139.0, 18.0 ]
+				}
+
+			}
+, 			{
+				"box" : 				{
+					"fontname" : "Arial",
+					"fontsize" : 12.0,
+					"id" : "obj-8",
+					"maxclass" : "newobj",
+					"numinlets" : 1,
+					"numoutlets" : 1,
+					"outlettype" : [ "" ],
+					"patching_rect" : [ 162.5, 26.0, 100.0, 20.0 ],
+					"text" : "udpreceive 9997"
+				}
+
+			}
+ ],
+		"lines" : [ 			{
+				"patchline" : 				{
+					"destination" : [ "obj-11", 0 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-12", 0 ]
+				}
+
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-11", 0 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-13", 0 ]
+				}
+
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-12", 0 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-15", 0 ]
+				}
+
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-13", 0 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-16", 0 ]
+				}
+
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-18", 0 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-17", 0 ]
+				}
+
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-11", 0 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-18", 0 ]
+				}
+
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-1", 0 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-8", 0 ]
+				}
+
+			}
+, 			{
+				"patchline" : 				{
+					"destination" : [ "obj-10", 1 ],
+					"disabled" : 0,
+					"hidden" : 0,
+					"source" : [ "obj-8", 0 ]
+				}
+
+			}
+ ],
+		"dependency_cache" : [  ]
+	}
+
+}
diff --git a/headers/GUI/AttributesEditor.hpp b/headers/GUI/AttributesEditor.hpp
@@ -49,6 +49,7 @@
 
 #include <QDockWidget>
 #include <QString>
+#include <QColorDialog>
 
 class QButtonGroup;
 class QRadioButton;
@@ -81,7 +82,6 @@ class NetworkMessages;
 class AttributesEditor : public QDockWidget
 {
   Q_OBJECT
-
   public:
     AttributesEditor(QWidget* parent);
 
@@ -113,6 +113,8 @@ class AttributesEditor : public QDockWidget
      **/
     unsigned int currentBox();
 
+    static const int BUTTON_SIZE;
+
     inline void setBoxEdited(unsigned int boxId){ _boxEdited = boxId; }
 
   public slots:
@@ -174,8 +176,8 @@ class AttributesEditor : public QDockWidget
      * \brief Associates slots with QWidgets' signals.
      **/
     void connectSlots();
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *event);
+
+    QString _pushButtonStyle;
 
   private slots:
     /*!
@@ -184,8 +186,6 @@ class AttributesEditor : public QDockWidget
     void changeColor();
     void startMessageChanged(QTreeWidgetItem *item);
     void endMessageChanged(QTreeWidgetItem *item);
-    void startMessageRemoved(const std::string &address);
-    void endMessageRemoved(const std::string &address);
     void curveActivationChanged(QTreeWidgetItem *item, bool activated);
     void curveRedundancyChanged(QTreeWidgetItem *item, bool activated);
     void curveSampleRateChanged(QTreeWidgetItem *item, int value);
@@ -201,20 +201,14 @@ class AttributesEditor : public QDockWidget
      * \brief Updates box end message
      */
     void endMessagesChanged(bool forceUpdate = false);
-    /*!
-     * \brief Called when the start of the box is changed.
-     */
-    void startChanged();
-
-    /*!
-     * \brief Called when the length of the box is changed.
-     */
-    void lengthChanged();
 
     /*!
      * \brief Called when the name of the box is changed.
      */
     void nameChanged();
+	void currentColorSelectionChanged(const QColor& );
+	void revertColor();
+
 
   private:
     QWidget * _centralWidget;   //!< Central widget.
@@ -238,5 +232,8 @@ class AttributesEditor : public QDockWidget
 
     unsigned int _boxEdited;    //!< ID of box being edited
     MaquetteScene * _scene; //!< The maquetteScene related with.
+
+	QColorDialog _colorDialog{this};
+	QColor _currentBoxOriginalColor;
 };
 #endif