Bugfix ofParameter change name

addons/ofxGui/src/ofxBaseGui.cpp

@@ -483,3 +483,15 @@ void ofxBaseGui::disableHiDpi(){
 bool ofxBaseGui::isHiDpiEnabled(){
 	return hiDpiScale == 2;
 }
+
+void ofxBaseGui::nameChanged( std::string& )
+{
+	auto& p = getParameter();
+
+	setNeedsRedraw();
+
+}
+void ofxBaseGui::setNameListener()
+{
+ 	nameChangeListener = getParameter().nameChangedEvent().newListener(this, &ofxBaseGui::nameChanged);
+}

addons/ofxGui/src/ofxBaseGui.h

@@ -142,10 +142,17 @@ class ofxBaseGui {
 
 		void setNeedsRedraw();
 		ofCoreEvents * events = nullptr;
+
+		void setNameListener();
+
 	private:
 		bool needsRedraw;
 		unsigned long currentFrame;
 		bool bRegisteredForMouseEvents;
 
+		ofEventListener nameChangeListener;
+
+		void nameChanged( std::string& );
+
 		//std::vector<ofEventListener> coreListeners;
 };

addons/ofxGui/src/ofxButton.cpp

@@ -26,7 +26,7 @@ ofxButton* ofxButton::setup(ofParameter<void> _bVal, float width, float height){
 	registerMouseEvents();
 
 	value.addListener(this,&ofxButton::valueChanged);
-
+	setNameListener();
 	return this;
 }
 
@@ -43,7 +43,7 @@ ofxButton* ofxButton::setup(const std::string& toggleName, float width, float he
 	registerMouseEvents();
 
 	value.addListener(this,&ofxButton::valueChanged);
-
+	setNameListener();
 	return this;
 }
 

addons/ofxGui/src/ofxColorPicker.cpp

@@ -168,6 +168,8 @@ ofxColorPicker_<ColorType> * ofxColorPicker_<ColorType>::setup(ofParameter<ofCol
     listener = color.newListener(colorChanged);
 	setShape(b.x, b.y, w, h);
 	colorChanged(color.get());//needs this so the color wheel shows the correct color once setup.
+	setNameListener();
+
 	return this;
 }
 template<class ColorType>

addons/ofxGui/src/ofxGuiGroup.cpp

@@ -131,6 +131,7 @@ ofxGuiGroup * ofxGuiGroup::setup(const ofParameterGroup & _parameters, const std
 	parameters = _parameters;
 	registerMouseEvents();
 
+	setNameListener();
 	setNeedsRedraw();
 
 	return this;

addons/ofxGui/src/ofxInputField.cpp

@@ -148,6 +148,7 @@ ofxInputField<Type>* ofxInputField<Type>::setup(ofParameter<Type> _val, float wi
 	listeners.push(value.newListener(this,&ofxInputField::valueChanged));
 	listeners.push(ofEvents().charEvent.newListener(this, &ofxInputField<Type>::charPressed, OF_EVENT_ORDER_BEFORE_APP));
 	listeners.push(ofEvents().keyPressed.newListener(this, &ofxInputField<Type>::keyPressed, OF_EVENT_ORDER_BEFORE_APP));
+	setNameListener();
 	return this;
 }
 

addons/ofxGui/src/ofxSlider.cpp

@@ -57,7 +57,7 @@ ofxSlider<Type>* ofxSlider<Type>::setup(ofParameter<Type> _val, float width, flo
 
 	value.addListener(this,&ofxSlider::valueChanged);
 	registerMouseEvents();
-
+	setNameListener();
 	input.setup(_val, width, height);
 	return this;
 }

addons/ofxGui/src/ofxSliderGroup.cpp

@@ -29,6 +29,7 @@ ofxVecSlider_<VecType> * ofxVecSlider_<VecType>::setup(ofParameter<VecType> valu
     }
 
     sliderChanging = false;
+	setNameListener();
     return this;
 
 }
@@ -154,7 +155,7 @@ ofxColorSlider_<ColorType> * ofxColorSlider_<ColorType>::setup(ofParameter<ofCol
 	add(&picker);
 	listeners.push(picker.getParameter().template cast<ofColor_<ColorType>>().newListener(this, & ofxColorSlider_::changeValue));
 
-
+	setNameListener();
 	sliderChanging = false;
 	minimize();
     return this;
@@ -294,7 +295,7 @@ ofxRectangleSlider * ofxRectangleSlider::setup(ofParameter<ofRectangle> value, f
         add(createGuiElement<ofxSlider<float>>(h, width, height));
         listeners.push(h.newListener(this, & ofxRectangleSlider::changeSlider));
 
-
+	setNameListener();
     sliderChanging = false;
     return this;
 

addons/ofxGui/src/ofxToggle.cpp

@@ -22,7 +22,7 @@ ofxToggle * ofxToggle::setup(ofParameter<bool> _bVal, float width, float height)
 	value.addListener(this,&ofxToggle::valueChanged);
 	registerMouseEvents();
 	setNeedsRedraw();
-
+	setNameListener();
 	return this;
 
 }

libs/openFrameworks/types/ofParameter.cpp

@@ -80,8 +80,21 @@ ofParameter<void>::ofParameter(const string& name)
 
 }
 
-void ofParameter<void>::setName(const string & name){
+bool ofParameter<void>::setName(const string & name){
+	std::string oldName = getName();
+	if(escape(name) == escape(oldName)) return false;
+	if(!ofParameterGroup::changeChildName(this, obj->parents, escape(oldName), escape(name))){
+		setName(oldName);
+		return false;
+	}
 	obj->name = name;
+	return true;
+}
+
+
+ofEvent<std::string>& ofParameter<void>::nameChangedEvent()
+{
+	return obj->nameChangedEvent;
 }
 
 string ofParameter<void>::getName() const{
@@ -110,11 +123,8 @@ void ofParameter<void>::trigger(){
     // Notify all parents, if there are any.
     if(!obj->parents.empty())
     {
-        // Erase each invalid parent
-        obj->parents.erase(std::remove_if(obj->parents.begin(),
-                                          obj->parents.end(),
-                                          [](const std::weak_ptr<ofParameterGroup::Value> & p){ return p.expired(); }),
-                           obj->parents.end());
+		// Erase each invalid parent
+		ofParameterGroup::checkAndRemoveExpiredParents(obj->parents);
 
         // notify all leftover (valid) parents of this object's changed value.
         // this can't happen in the same iterator as above, because a notified listener
@@ -135,10 +145,7 @@ void ofParameter<void>::trigger(const void * sender){
     if(!obj->parents.empty())
     {
         // Erase each invalid parent
-        obj->parents.erase(std::remove_if(obj->parents.begin(),
-                                          obj->parents.end(),
-                                          [](const std::weak_ptr<ofParameterGroup::Value> & p){ return p.expired(); }),
-                           obj->parents.end());
+		ofParameterGroup::checkAndRemoveExpiredParents(obj->parents);
 
         // notify all leftover (valid) parents of this object's changed value.
         // this can't happen in the same iterator as above, because a notified listener

libs/openFrameworks/types/ofParameter.h

@@ -24,7 +24,7 @@ class ofAbstractParameter{
 public:
 	virtual ~ofAbstractParameter(){}
 	virtual std::string getName() const = 0;
-	virtual void setName(const std::string & name) = 0;
+	virtual bool setName(const std::string & name) = 0;
 	virtual std::string toString() const = 0;
 	virtual void fromString(const std::string & str) = 0;
 
@@ -67,11 +67,16 @@ class ofAbstractParameter{
 
 	virtual bool isReferenceTo(const ofAbstractParameter& other) const;
 
+	virtual ofEvent<std::string>& nameChangedEvent() = 0;
+
 protected:
 	virtual const ofParameterGroup getFirstParent() const = 0;
 	virtual void setSerializable(bool serializable)=0;
 	virtual std::string escape(const std::string& str) const;
 	virtual const void* getInternalObject() const = 0;
+
+
+
 };
 
 
@@ -223,7 +228,7 @@ class ofParameterGroup: public ofAbstractParameter {
 	friend std::ostream& operator<<(std::ostream& os, const ofParameterGroup& group);
 
 	std::string getName() const;
-	void setName(const std::string& name);
+	bool setName(const std::string& name);
 	std::string getEscapedName() const;
 	std::string toString() const;
 	void fromString(const std::string& name);
@@ -245,7 +250,10 @@ class ofParameterGroup: public ofAbstractParameter {
 	operator bool() const;
 
 	ofEvent<ofAbstractParameter> & parameterChangedE();
-
+	virtual ofEvent<std::string>& nameChangedEvent();
+	ofEvent<ofAbstractParameter>& childNameChangedEvent();
+
+
 	std::vector<std::shared_ptr<ofAbstractParameter> >::iterator begin();
 	std::vector<std::shared_ptr<ofAbstractParameter> >::iterator end();
 	std::vector<std::shared_ptr<ofAbstractParameter> >::const_iterator begin() const;
@@ -265,18 +273,27 @@ class ofParameterGroup: public ofAbstractParameter {
 		:serializable(true){}
 
 		void notifyParameterChanged(ofAbstractParameter & param);
-
+		bool updateParameterName(const std::string oldName, const std::string newName);
+		void notifyParameterNameChanged(ofAbstractParameter & param);
+
 		std::map<std::string,std::size_t> parametersIndex;
 		std::vector<std::shared_ptr<ofAbstractParameter> > parameters;
 		std::string name;
 		bool serializable;
 		std::vector<std::weak_ptr<Value>> parents;
 		ofEvent<ofAbstractParameter> parameterChangedE;
+		ofEvent<std::string> nameChangedEvent;
+		ofEvent<ofAbstractParameter> childNameChangedEvent;
 	};
 	std::shared_ptr<Value> obj;
 	ofParameterGroup(std::shared_ptr<Value> obj)
 	:obj(obj){}
 
+
+	static void checkAndRemoveExpiredParents(std::vector<std::weak_ptr<Value>> & parents);
+
+	static bool changeChildName(ofAbstractParameter* child, std::vector<std::weak_ptr<Value>> & parents, const std::string& oldName, std::string newName);
+
 	template<typename T>
 	friend class ofParameter;
 
@@ -500,7 +517,7 @@ class ofParameter: public ofAbstractParameter{
 	const ParameterType * operator->() const;
 	operator const ParameterType & () const;
 
-	void setName(const std::string & name);
+	bool setName(const std::string & name);
 	std::string getName() const;
 
 	ParameterType getMin() const;
@@ -580,16 +597,20 @@ class ofParameter: public ofAbstractParameter{
 	void setParent(ofParameterGroup & _parent);
 
 	const ofParameterGroup getFirstParent() const{
-		obj->parents.erase(std::remove_if(obj->parents.begin(),obj->parents.end(),
-						   [](std::weak_ptr<ofParameterGroup::Value> p){return p.lock()==nullptr;}),
-						obj->parents.end());
+//		obj->parents.erase(std::remove_if(obj->parents.begin(),obj->parents.end(),
+//						   [](std::weak_ptr<ofParameterGroup::Value> p){return p.lock()==nullptr;}),
+//						obj->parents.end());
+//
+		ofParameterGroup::checkAndRemoveExpiredParents(obj->parents);
 		if(!obj->parents.empty()){
 			return obj->parents.front().lock();
 		}else{
 			return std::shared_ptr<ofParameterGroup::Value>(nullptr);
 		}
 	}
 
+	virtual ofEvent<std::string>& nameChangedEvent();
+
 	size_t getNumListeners() const;
 	const void* getInternalObject() const;
 
@@ -631,6 +652,7 @@ class ofParameter: public ofAbstractParameter{
 		ParameterType value;
 		ParameterType min, max;
 		ofEvent<ParameterType> changedE;
+		ofEvent<std::string> nameChangedEvent;
 		bool bInNotify;
 		bool serializable;
 		std::vector<std::weak_ptr<ofParameterGroup::Value>> parents;
@@ -745,10 +767,7 @@ inline void ofParameter<ParameterType>::eventsSetValue(const ParameterType & v){
 		if(!obj->parents.empty())
 		{
 			// Erase each invalid parent
-			obj->parents.erase(std::remove_if(obj->parents.begin(),
-											  obj->parents.end(),
-											  [](const std::weak_ptr<ofParameterGroup::Value> & p){ return p.expired(); }),
-							   obj->parents.end());
+			ofParameterGroup::checkAndRemoveExpiredParents(obj->parents);
 
 			// notify all leftover (valid) parents of this object's changed value.
 			// this can't happen in the same iterator as above, because a notified listener
@@ -817,8 +836,20 @@ inline ofParameter<ParameterType>::operator const ParameterType & () const{
 }
 
 template<typename ParameterType>
-void ofParameter<ParameterType>::setName(const std::string & name){
+bool ofParameter<ParameterType>::setName(const std::string & name){
+	std::string oldName = getName();
+	if(escape(name) == escape(oldName)) return false;
+	if(!ofParameterGroup::changeChildName(this, obj->parents, escape(oldName), escape(name))){
+		setName(oldName);
+		return false;
+	}
 	obj->name = name;
+	return true;
+}
+template<typename ParameterType>
+ofEvent<std::string>& ofParameter<ParameterType>::nameChangedEvent()
+{
+	return obj->nameChangedEvent;
 }
 
 template<typename ParameterType>
@@ -998,7 +1029,7 @@ class ofParameter<void>: public ofAbstractParameter{
 
 	ofParameter<void>& set(const std::string & name);
 
-	void setName(const std::string & name);
+	bool setName(const std::string & name);
 	std::string getName() const;
 
 	std::string toString() const;
@@ -1048,6 +1079,9 @@ class ofParameter<void>: public ofAbstractParameter{
 	const void* getInternalObject() const{
 		return obj.get();
 	}
+
+	virtual ofEvent<std::string>& nameChangedEvent();
+
 protected:
 
 private:
@@ -1062,6 +1096,7 @@ class ofParameter<void>: public ofAbstractParameter{
 
 		std::string name;
 		ofEvent<void> changedE;
+		ofEvent<std::string> nameChangedEvent;
 		bool serializable;
 		std::vector<std::weak_ptr<ofParameterGroup::Value>> parents;
 	};
@@ -1118,7 +1153,8 @@ class ofReadOnlyParameter: public ofAbstractParameter{
 	std::string valueType() const;
 
 protected:
-	void setName(const std::string & name);
+	virtual ofEvent<std::string>& nameChangedEvent();
+	bool setName(const std::string & name);
 	void enableEvents();
 	void disableEvents();
 	void setSerializable(bool s);
@@ -1280,8 +1316,13 @@ inline std::unique_ptr<of::priv::AbstractEventToken> ofReadOnlyParameter<Paramet
 }
 
 template<typename ParameterType,typename Friend>
-inline void ofReadOnlyParameter<ParameterType,Friend>::setName(const std::string & name){
-	parameter.setName(name);
+inline bool ofReadOnlyParameter<ParameterType,Friend>::setName(const std::string & name){
+	return parameter.setName(name);
+}
+
+template<typename ParameterType,typename Friend>
+inline ofEvent<std::string>& ofReadOnlyParameter<ParameterType,Friend>::nameChangedEvent(){
+	return parameter.nameChangedEvent();
 }
 
 template<typename ParameterType,typename Friend>