[Jderobot-admin] jderobot-r1106 - in trunk/src/stable/components/visualHFSM: . popups

bmenendez en jderobot.org bmenendez en jderobot.org
Mie Nov 13 16:51:45 CET 2013


Author: bmenendez
Date: 2013-11-13 16:51:44 +0100 (Wed, 13 Nov 2013)
New Revision: 1106

Modified:
   trunk/src/stable/components/visualHFSM/common.h
   trunk/src/stable/components/visualHFSM/generate.cpp
   trunk/src/stable/components/visualHFSM/generate.h
   trunk/src/stable/components/visualHFSM/getinterfaces.sh
   trunk/src/stable/components/visualHFSM/guinode.cpp
   trunk/src/stable/components/visualHFSM/guinode.h
   trunk/src/stable/components/visualHFSM/guisubautomata.cpp
   trunk/src/stable/components/visualHFSM/guisubautomata.h
   trunk/src/stable/components/visualHFSM/guitransition.cpp
   trunk/src/stable/components/visualHFSM/guitransition.h
   trunk/src/stable/components/visualHFSM/iceinterface.cpp
   trunk/src/stable/components/visualHFSM/iceinterface.h
   trunk/src/stable/components/visualHFSM/main.cpp
   trunk/src/stable/components/visualHFSM/node.cpp
   trunk/src/stable/components/visualHFSM/node.h
   trunk/src/stable/components/visualHFSM/point.cpp
   trunk/src/stable/components/visualHFSM/point.h
   trunk/src/stable/components/visualHFSM/popups/configfiledialog.cpp
   trunk/src/stable/components/visualHFSM/popups/configfiledialog.h
   trunk/src/stable/components/visualHFSM/popups/editnodedialog.cpp
   trunk/src/stable/components/visualHFSM/popups/editnodedialog.h
   trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.cpp
   trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.h
   trunk/src/stable/components/visualHFSM/popups/funvardialog.cpp
   trunk/src/stable/components/visualHFSM/popups/funvardialog.h
   trunk/src/stable/components/visualHFSM/popups/librariesdialog.cpp
   trunk/src/stable/components/visualHFSM/popups/librariesdialog.h
   trunk/src/stable/components/visualHFSM/popups/loadfiledialog.cpp
   trunk/src/stable/components/visualHFSM/popups/loadfiledialog.h
   trunk/src/stable/components/visualHFSM/popups/renamedialog.cpp
   trunk/src/stable/components/visualHFSM/popups/renamedialog.h
   trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.cpp
   trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.h
   trunk/src/stable/components/visualHFSM/popups/savefiledialog.cpp
   trunk/src/stable/components/visualHFSM/popups/savefiledialog.h
   trunk/src/stable/components/visualHFSM/popups/timerdialog.cpp
   trunk/src/stable/components/visualHFSM/popups/timerdialog.h
   trunk/src/stable/components/visualHFSM/savefile.cpp
   trunk/src/stable/components/visualHFSM/savefile.h
   trunk/src/stable/components/visualHFSM/subautomata.cpp
   trunk/src/stable/components/visualHFSM/subautomata.h
   trunk/src/stable/components/visualHFSM/transition.cpp
   trunk/src/stable/components/visualHFSM/transition.h
   trunk/src/stable/components/visualHFSM/visualhfsm.cpp
   trunk/src/stable/components/visualHFSM/visualhfsm.h
   trunk/src/stable/components/visualHFSM/xmlparser.cpp
   trunk/src/stable/components/visualHFSM/xmlparser.h
Log:
#117 Removing bugs.


Modified: trunk/src/stable/components/visualHFSM/common.h
===================================================================
--- trunk/src/stable/components/visualHFSM/common.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/common.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 
@@ -25,6 +26,11 @@
 #include <iostream>
 
 /*************************************************************
+ * FOR AUTOMATAS
+ *************************************************************/
+const std::string TIME_DEFAULT = "100";
+
+/*************************************************************
  * FOR NODES
  *************************************************************/
 const int RADIUS_NORMAL = 20;

Modified: trunk/src/stable/components/visualHFSM/generate.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/generate.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/generate.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/generate.h
===================================================================
--- trunk/src/stable/components/visualHFSM/generate.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/generate.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/getinterfaces.sh
===================================================================
--- trunk/src/stable/components/visualHFSM/getinterfaces.sh	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/getinterfaces.sh	2013-11-13 15:51:44 UTC (rev 1106)
@@ -17,7 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 LICENSE

Modified: trunk/src/stable/components/visualHFSM/guinode.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/guinode.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/guinode.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 
@@ -220,15 +221,20 @@
 }
 
 void GuiNode::changeText ( std::string newText ) {
+	double x;
+	#ifdef GLIBMM_PROPERTIES_ENABLED
+    x = this->ellipse->property_x();
+    #else
+    x = this->ellipse->get_property("x");
+    #endif //GLIBMM_PROPERTIES_ENABLED
+
 	this->node.setName(newText);
 	#ifdef GLIBMM_PROPERTIES_ENABLED
     this->text->property_text() = newText;
-    this->text->property_x() = this->point.getX() - newText.size() * PIXELS_PER_LETTER;
-    this->text->property_y() = this->point.getY() - Y_NODE_IDEAL;
+    this->text->property_x() = x - newText.size() * PIXELS_PER_LETTER;
     #else
     this->text->set_property("text", newText);
-    this->text->set_property("x", this->point.getX() - newText.size() * PIXELS_PER_LETTER);
-    this->text->set_property("y", this->point.getY() - Y_NODE_IDEAL);
+    this->text->set_property("x", x - newText.size() * PIXELS_PER_LETTER);
     #endif //GLIBMM_PROPERTIES_ENABLED
 }
 

Modified: trunk/src/stable/components/visualHFSM/guinode.h
===================================================================
--- trunk/src/stable/components/visualHFSM/guinode.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/guinode.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/guisubautomata.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/guisubautomata.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/guisubautomata.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/guisubautomata.h
===================================================================
--- trunk/src/stable/components/visualHFSM/guisubautomata.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/guisubautomata.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/guitransition.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/guitransition.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/guitransition.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/guitransition.h
===================================================================
--- trunk/src/stable/components/visualHFSM/guitransition.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/guitransition.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/iceinterface.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/iceinterface.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/iceinterface.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/iceinterface.h
===================================================================
--- trunk/src/stable/components/visualHFSM/iceinterface.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/iceinterface.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/main.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/main.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/main.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/node.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/node.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/node.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/node.h
===================================================================
--- trunk/src/stable/components/visualHFSM/node.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/node.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/point.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/point.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/point.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/point.h
===================================================================
--- trunk/src/stable/components/visualHFSM/point.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/point.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/configfiledialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/configfiledialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/configfiledialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/configfiledialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/configfiledialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/configfiledialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/editnodedialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/editnodedialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/editnodedialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/editnodedialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/editnodedialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/editnodedialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/edittransitiondialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/funvardialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/funvardialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/funvardialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/funvardialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/funvardialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/funvardialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/librariesdialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/librariesdialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/librariesdialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/librariesdialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/librariesdialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/librariesdialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/loadfiledialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/loadfiledialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/loadfiledialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/loadfiledialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/loadfiledialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/loadfiledialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/renamedialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/renamedialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/renamedialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/renamedialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/renamedialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/renamedialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/renametransitiondialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/savefiledialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/savefiledialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/savefiledialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/savefiledialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/savefiledialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/savefiledialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/timerdialog.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/timerdialog.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/timerdialog.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/popups/timerdialog.h
===================================================================
--- trunk/src/stable/components/visualHFSM/popups/timerdialog.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/popups/timerdialog.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/savefile.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/savefile.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/savefile.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/savefile.h
===================================================================
--- trunk/src/stable/components/visualHFSM/savefile.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/savefile.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/subautomata.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/subautomata.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/subautomata.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/subautomata.h
===================================================================
--- trunk/src/stable/components/visualHFSM/subautomata.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/subautomata.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/transition.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/transition.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/transition.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -1,3 +1,24 @@
+/*
+ *  Copyright (C) 1997-2013 JDERobot Developers Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
+ *
+ */
+
 #include "transition.h"
 
 /*************************************************************

Modified: trunk/src/stable/components/visualHFSM/transition.h
===================================================================
--- trunk/src/stable/components/visualHFSM/transition.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/transition.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/visualhfsm.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/visualhfsm.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/visualhfsm.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 
@@ -123,6 +124,7 @@
 
     this->id = 1;
     GuiSubautomata guisub(id, 0);
+    guisub.setTime(TIME_DEFAULT);
     this->subautomataList.push_back(guisub);
     this->currentSubautomata = this->getSubautomata(id);
     this->id++;
@@ -214,17 +216,7 @@
 
 // Receive the signal of name changed in a state for changing it in the treeview
 void VisualHFSM::on_change_node_name ( int id, std::string name ) {
-    typedef Gtk::TreeModel::Children type_children;
-    type_children children = this->refTreeModel->children();
-    type_children::iterator childrenIterator = children.begin();
-    while ( childrenIterator != children.end() ) {
-        Gtk::TreeModel::Row row = *childrenIterator;
-        if (row[m_Columns.m_col_id] == id) {
-            row[m_Columns.m_col_name] = name;
-            break;
-        } else
-            childrenIterator++;
-    }
+    this->changeNameInTreeView(id, name, this->refTreeModel->children());
 }
 
 /*************************************************************
@@ -593,6 +585,24 @@
     return cont;
 }
 
+// Change a name of a state in the treeview
+bool VisualHFSM::changeNameInTreeView ( int id, std::string nameNode, Gtk::TreeModel::Children child ) {
+    bool cont = true;
+    Gtk::TreeModel::Children::iterator iter = child.begin();
+    while ( cont && (iter != child.end()) ) {
+        Gtk::TreeModel::Row therow = *iter;
+        if (therow[m_Columns.m_col_id] == id) {
+            therow[m_Columns.m_col_name] = nameNode;
+            cont = false;
+        } else {
+            cont = this->changeNameInTreeView(id, nameNode, therow.children());
+            iter++;
+        }
+    }
+
+    return cont;
+}
+
 /*************************************************************
  * OF THE SCHEMA
  *************************************************************/
@@ -733,6 +743,7 @@
                 
                 this->currentSubautomata->setIdSubautomataSon(id, item);
                 GuiSubautomata newSubautomata(id, this->currentSubautomata->getId());
+                newSubautomata.setTime(TIME_DEFAULT);
                 subautomataList.push_back(newSubautomata);
                 this->currentSubautomata = this->getSubautomata(id);
                 id++;

Modified: trunk/src/stable/components/visualHFSM/visualhfsm.h
===================================================================
--- trunk/src/stable/components/visualHFSM/visualhfsm.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/visualhfsm.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 
@@ -197,6 +198,7 @@
     // Of the treeview
     bool fillTreeView ( std::string nameNode, Gtk::TreeModel::Children child, int idNodeFather );
     bool removeFromTreeView ( int id, Gtk::TreeModel::Children child );
+    bool changeNameInTreeView ( int id, std::string nameNode, Gtk::TreeModel::Children child );
 
     // Of the schema
     bool on_schema_event ( GdkEvent* event );

Modified: trunk/src/stable/components/visualHFSM/xmlparser.cpp
===================================================================
--- trunk/src/stable/components/visualHFSM/xmlparser.cpp	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/xmlparser.cpp	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 

Modified: trunk/src/stable/components/visualHFSM/xmlparser.h
===================================================================
--- trunk/src/stable/components/visualHFSM/xmlparser.h	2013-11-13 12:38:27 UTC (rev 1105)
+++ trunk/src/stable/components/visualHFSM/xmlparser.h	2013-11-13 15:51:44 UTC (rev 1106)
@@ -14,7 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
- *  Authors : Borja Menéndez <borjamonserrano en gmail.com>
+ *  Authors : Borja Menéndez Moreno <b.menendez.moreno en gmail.com>
+ *            José María Cañas Plaza <jmplaza en gsyc.es>
  *
  */
 



More information about the Jderobot-admin mailing list