diff --git a/README.md b/README.md index b101a331a..ab223fb1d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ JdeRobot simplifies the access to hardware devices from the control program. Get * Wiimote * X10 home automation devices -JdeRobot includes several robot programming tools and libraries. First, viewers and teleoperators for several robots, its sensors and motors. Second, a camara calibration component and a tunning tool for color filters. Third, VisualHFSM tool for programming robot behavior using hierarchical finite state machines. It includes many sample components using OpenCV, PCL, OpenGL, etc.. In addition, it also provides a library to develop fuzzy controllers, a library for projective geometry and some computer vision processing. +JdeRobot includes several robot programming tools and libraries. First, viewers and teleoperators for several robots, its sensors and motors. Second, a camara calibration component and a tunning tool for color filters. Third, VisualStates tool for programming robot behavior using hierarchical finite state machines. It includes many sample components using OpenCV, PCL, OpenGL, etc.. In addition, it also provides a library to develop fuzzy controllers, a library for projective geometry and some computer vision processing. Each component may have its own independent Graphical User Interface or none at all. Currently, GTK and Qt libraries are supported, and several examples of OpenGL for 3D graphics with both libraries are included. diff --git a/src/tools/visualHFSM/setup.sh b/src/tools/visualHFSM/setup.sh deleted file mode 100755 index a1124c91b..000000000 --- a/src/tools/visualHFSM/setup.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2016 -# Author: Samuel Rey -# License: GPLv3 - -#C++ Dependencies -sudo mkdir /usr/local/include/jderobot/visualHFSM -sudo cp *.h /usr/local/include/jderobot/visualHFSM/ -sudo mkdir /usr/local/include/jderobot/visualHFSM/popups -sudo cp popups/*.h /usr/local/include/jderobot/visualHFSM/popups/ -sudo mkdir /usr/local/share/jderobot/glade/visualHFSM -sudo cp gui/* /usr/local/share/jderobot/glade/visualHFSM/ -sudo cp getinterfaces.sh /usr/local/bin - -#Python Dependencies -sudo mkdir /usr/local/share/jderobot/python/visualHFSM_py -sudo cp *.py /usr/local/share/jderobot/python/visualHFSM_py -sudo mkdir /usr/local/share/jderobot/python/visualHFSM_py/gui -sudo cp gui/*.py /usr/local/share/jderobot/python/visualHFSM_py/gui - -sudo cp visualHFSM /usr/local/bin - -echo "Dependencies installed" \ No newline at end of file diff --git a/src/tools/visualHFSM/CMakeLists.txt b/src/tools/visualStates/CMakeLists.txt similarity index 77% rename from src/tools/visualHFSM/CMakeLists.txt rename to src/tools/visualStates/CMakeLists.txt index a5b9e8000..fe43e00d9 100644 --- a/src/tools/visualHFSM/CMakeLists.txt +++ b/src/tools/visualStates/CMakeLists.txt @@ -1,6 +1,6 @@ IF (goocanvasmm_INCLUDE_DIRS) -SET( SOURCE_FILES_VISUALHFSM +SET( SOURCE_FILES_VISUALSTATES iceinterface.cpp point.cpp node.cpp @@ -23,7 +23,7 @@ SET( SOURCE_FILES_VISUALHFSM popups/timerdialog.cpp savefile.cpp xmlparser.cpp - visualhfsm.cpp + visualStates.cpp main.cpp ) @@ -59,10 +59,10 @@ include_directories ( ${resourcelocator_INCLUDE_DIRS} ) -add_executable (visualHFSM ${SOURCE_FILES_VISUALHFSM}) -add_library(visualHFSMlib ${SOURCE_FILES_RUNTIMEGUI}) +add_executable (visualStates ${SOURCE_FILES_VISUALSTATES}) +add_library(visualStateslib ${SOURCE_FILES_RUNTIMEGUI}) -TARGET_LINK_LIBRARIES ( visualHFSM +TARGET_LINK_LIBRARIES ( visualStates ${gtkmm3_LIBRARIES} ${goocanvasmm_LIBRARIES} ${gtk3_LIBRARIES} @@ -72,7 +72,7 @@ TARGET_LINK_LIBRARIES ( visualHFSM ) -TARGET_LINK_LIBRARIES ( visualHFSMlib +TARGET_LINK_LIBRARIES ( visualStateslib ${gtkmm3_LIBRARIES} ${goocanvasmm_LIBRARIES} ${gtk3_LIBRARIES} @@ -81,20 +81,20 @@ TARGET_LINK_LIBRARIES ( visualHFSMlib ${GLOG_LIBRARIES} ) -add_custom_command(TARGET visualHFSM POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/gui $/gui) +add_custom_command(TARGET visualStates POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/gui $/gui) -add_custom_command(TARGET visualHFSM POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/getinterfaces.sh $) +add_custom_command(TARGET visualStates POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/getinterfaces.sh $) - install(TARGETS visualHFSM + install(TARGETS visualStates DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ COMPONENT tools ) - install(TARGETS visualHFSMlib DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot/ COMPONENT tools) + install(TARGETS visualStateslib DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/jderobot/ COMPONENT tools) # Install Glade FILE(GLOB_RECURSE GLADE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.glade) diff --git a/src/tools/visualHFSM/automatagui.cpp b/src/tools/visualStates/automatagui.cpp similarity index 99% rename from src/tools/visualHFSM/automatagui.cpp rename to src/tools/visualStates/automatagui.cpp index 90667bbe5..38914364b 100644 --- a/src/tools/visualHFSM/automatagui.cpp +++ b/src/tools/visualStates/automatagui.cpp @@ -24,7 +24,7 @@ * CONSTRUCTOR *************************************************************/ AutomataGui::AutomataGui(int argc, char** argv) : dispatcher(){ - this->app = Gtk::Application::create("jderobot.visualHFSM.automatagui"); + this->app = Gtk::Application::create("jderobot.visualStates.automatagui"); } /************************************************************* diff --git a/src/tools/visualHFSM/automatagui.h b/src/tools/visualStates/automatagui.h similarity index 100% rename from src/tools/visualHFSM/automatagui.h rename to src/tools/visualStates/automatagui.h diff --git a/src/tools/visualHFSM/automatagui.py b/src/tools/visualStates/automatagui.py similarity index 98% rename from src/tools/visualHFSM/automatagui.py rename to src/tools/visualStates/automatagui.py index cd75109c5..55b318f61 100644 --- a/src/tools/visualHFSM/automatagui.py +++ b/src/tools/visualStates/automatagui.py @@ -25,7 +25,7 @@ from treeModel import TreeModel import sys, signal, math from guisubautomata import GuiSubautomata -from gui.runtimeGui import Ui_visualHFSM +from gui.runtimeGui import Ui_visualStates from gui.additionalSubautWind import Ui_SubautomataWindow @@ -44,7 +44,7 @@ def closeEvent(self, event): self.close() -class AutomataGui(QtGui.QMainWindow, Ui_visualHFSM): +class AutomataGui(QtGui.QMainWindow, Ui_visualStates): activeNodeSignal = QtCore.pyqtSignal(str) diff --git a/src/tools/visualHFSM/common.h b/src/tools/visualStates/common.h similarity index 100% rename from src/tools/visualHFSM/common.h rename to src/tools/visualStates/common.h diff --git a/src/tools/visualHFSM/generate.cpp b/src/tools/visualStates/generate.cpp similarity index 97% rename from src/tools/visualHFSM/generate.cpp rename to src/tools/visualStates/generate.cpp index 66c687100..eb3f1f0e2 100644 --- a/src/tools/visualHFSM/generate.cpp +++ b/src/tools/visualStates/generate.cpp @@ -122,7 +122,7 @@ void Generate::generateGenericHeaders () { this->fs << "#include " << std::endl; this->fs << "#include " << std::endl; this->fs << "#include " << std::endl; - this->fs << "#include " << std::endl; + this->fs << "#include " << std::endl; this->fs << std::endl; for ( std::list::iterator listLibsIterator = this->listLibraries.begin(); listLibsIterator != this->listLibraries.end(); listLibsIterator++ ) @@ -673,7 +673,7 @@ void Generate::generateCmake () { this->fs << "\t${GTKMM_LIBRARIES}" << std::endl; this->fs << "\t${easyiceconfig_LIBRARIES}" << std::endl; this->fs << "\t${goocanvasmm_LIBRARIES}" <fs << "\t${LIBS_DIR}/jderobot/libvisualHFSMlib.so" << std::endl; + this->fs << "\t${LIBS_DIR}/jderobot/libvisualStateslib.so" << std::endl; this->fs << "\t${LIBS_DIR}/jderobot/libJderobotInterfaces.so" << std::endl; this->fs << "\t${LIBS_DIR}/jderobot/libjderobotutil.so" << std::endl; this->fs << "\tIce" << std::endl; @@ -703,7 +703,7 @@ void Generate::generateGenericHeaders_py(){ import Ice\n\ import easyiceconfig as EasyIce\n\ import sys, signal\n\ -sys.path.append('/usr/local/share/jderobot/python/visualHFSM_py')\n\ +sys.path.append('/usr/local/share/jderobot/python/visualStates_py')\n\ import traceback, threading, time\n\ from automatagui import AutomataGui, QtGui, GuiSubautomata\n\n"; diff --git a/src/tools/visualHFSM/generate.h b/src/tools/visualStates/generate.h similarity index 100% rename from src/tools/visualHFSM/generate.h rename to src/tools/visualStates/generate.h diff --git a/src/tools/visualHFSM/getinterfaces.sh b/src/tools/visualStates/getinterfaces.sh similarity index 100% rename from src/tools/visualHFSM/getinterfaces.sh rename to src/tools/visualStates/getinterfaces.sh diff --git a/src/tools/visualHFSM/gui/__init__.py b/src/tools/visualStates/gui/__init__.py similarity index 100% rename from src/tools/visualHFSM/gui/__init__.py rename to src/tools/visualStates/gui/__init__.py diff --git a/src/tools/visualHFSM/gui/additionalSubautWind.py b/src/tools/visualStates/gui/additionalSubautWind.py similarity index 100% rename from src/tools/visualHFSM/gui/additionalSubautWind.py rename to src/tools/visualStates/gui/additionalSubautWind.py diff --git a/src/tools/visualHFSM/gui/additional_libraries.glade b/src/tools/visualStates/gui/additional_libraries.glade similarity index 100% rename from src/tools/visualHFSM/gui/additional_libraries.glade rename to src/tools/visualStates/gui/additional_libraries.glade diff --git a/src/tools/visualHFSM/gui/automatagui.glade b/src/tools/visualStates/gui/automatagui.glade similarity index 100% rename from src/tools/visualHFSM/gui/automatagui.glade rename to src/tools/visualStates/gui/automatagui.glade diff --git a/src/tools/visualHFSM/gui/code.glade b/src/tools/visualStates/gui/code.glade similarity index 100% rename from src/tools/visualHFSM/gui/code.glade rename to src/tools/visualStates/gui/code.glade diff --git a/src/tools/visualHFSM/gui/configfile.glade b/src/tools/visualStates/gui/configfile.glade similarity index 100% rename from src/tools/visualHFSM/gui/configfile.glade rename to src/tools/visualStates/gui/configfile.glade diff --git a/src/tools/visualHFSM/gui/edittransition.glade b/src/tools/visualStates/gui/edittransition.glade similarity index 100% rename from src/tools/visualHFSM/gui/edittransition.glade rename to src/tools/visualStates/gui/edittransition.glade diff --git a/src/tools/visualHFSM/gui/edittransitioncode.glade b/src/tools/visualStates/gui/edittransitioncode.glade similarity index 100% rename from src/tools/visualHFSM/gui/edittransitioncode.glade rename to src/tools/visualStates/gui/edittransitioncode.glade diff --git a/src/tools/visualHFSM/gui/funvar.glade b/src/tools/visualStates/gui/funvar.glade similarity index 100% rename from src/tools/visualHFSM/gui/funvar.glade rename to src/tools/visualStates/gui/funvar.glade diff --git a/src/tools/visualHFSM/gui/import.glade b/src/tools/visualStates/gui/import.glade similarity index 100% rename from src/tools/visualHFSM/gui/import.glade rename to src/tools/visualStates/gui/import.glade diff --git a/src/tools/visualHFSM/gui/main_gui.glade b/src/tools/visualStates/gui/main_gui.glade similarity index 100% rename from src/tools/visualHFSM/gui/main_gui.glade rename to src/tools/visualStates/gui/main_gui.glade diff --git a/src/tools/visualHFSM/gui/name.glade b/src/tools/visualStates/gui/name.glade similarity index 100% rename from src/tools/visualHFSM/gui/name.glade rename to src/tools/visualStates/gui/name.glade diff --git a/src/tools/visualHFSM/gui/open.glade b/src/tools/visualStates/gui/open.glade similarity index 100% rename from src/tools/visualHFSM/gui/open.glade rename to src/tools/visualStates/gui/open.glade diff --git a/src/tools/visualHFSM/gui/runtimeGui.py b/src/tools/visualStates/gui/runtimeGui.py similarity index 77% rename from src/tools/visualHFSM/gui/runtimeGui.py rename to src/tools/visualStates/gui/runtimeGui.py index acda25489..5c8598323 100644 --- a/src/tools/visualHFSM/gui/runtimeGui.py +++ b/src/tools/visualStates/gui/runtimeGui.py @@ -23,11 +23,11 @@ def _translate(context, text, disambig): def _translate(context, text, disambig): return QtGui.QApplication.translate(context, text, disambig) -class Ui_visualHFSM(object): - def setupUi(self, visualHFSM): - visualHFSM.setObjectName(_fromUtf8("visualHFSM")) - visualHFSM.resize(761, 553) - self.centralwidget = QtGui.QWidget(visualHFSM) +class Ui_visualStates(object): + def setupUi(self, visualStates): + visualStates.setObjectName(_fromUtf8("visualStates")) + visualStates.resize(761, 553) + self.centralwidget = QtGui.QWidget(visualStates) self.centralwidget.setObjectName(_fromUtf8("centralwidget")) self.horizontalLayout = QtGui.QHBoxLayout(self.centralwidget) self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout")) @@ -69,25 +69,25 @@ def setupUi(self, visualHFSM): self.schemaView.setObjectName(_fromUtf8("schemaView")) self.verticalLayout_9.addWidget(self.schemaView) self.horizontalLayout.addWidget(self.frameSchema) - visualHFSM.setCentralWidget(self.centralwidget) + visualStates.setCentralWidget(self.centralwidget) - self.retranslateUi(visualHFSM) - QtCore.QMetaObject.connectSlotsByName(visualHFSM) + self.retranslateUi(visualStates) + QtCore.QMetaObject.connectSlotsByName(visualStates) - def retranslateUi(self, visualHFSM): - visualHFSM.setWindowTitle(_translate("visualHFSM", "visualHFSM - runtimeGUI", None)) - self.TreeViewLabel.setText(_translate("visualHFSM", "Tree VIew", None)) - self.autofocus.setText(_translate("visualHFSM", "Autofocus", None)) - self.upButton.setText(_translate("visualHFSM", "Up", None)) - self.SchemaLabel.setText(_translate("visualHFSM", "Schema", None)) + def retranslateUi(self, visualStates): + visualStates.setWindowTitle(_translate("visualStates", "visualStates - runtimeGUI", None)) + self.TreeViewLabel.setText(_translate("visualStates", "Tree VIew", None)) + self.autofocus.setText(_translate("visualStates", "Autofocus", None)) + self.upButton.setText(_translate("visualStates", "Up", None)) + self.SchemaLabel.setText(_translate("visualStates", "Schema", None)) if __name__ == "__main__": import sys app = QtGui.QApplication(sys.argv) - visualHFSM = QtGui.QMainWindow() - ui = Ui_visualHFSM() - ui.setupUi(visualHFSM) - visualHFSM.show() + visualStates = QtGui.QMainWindow() + ui = Ui_visualStates() + ui.setupUi(visualStates) + visualStates.show() sys.exit(app.exec_()) diff --git a/src/tools/visualHFSM/gui/save.glade b/src/tools/visualStates/gui/save.glade similarity index 100% rename from src/tools/visualHFSM/gui/save.glade rename to src/tools/visualStates/gui/save.glade diff --git a/src/tools/visualHFSM/gui/timing.glade b/src/tools/visualStates/gui/timing.glade similarity index 100% rename from src/tools/visualHFSM/gui/timing.glade rename to src/tools/visualStates/gui/timing.glade diff --git a/src/tools/visualHFSM/guinode.cpp b/src/tools/visualStates/guinode.cpp similarity index 100% rename from src/tools/visualHFSM/guinode.cpp rename to src/tools/visualStates/guinode.cpp diff --git a/src/tools/visualHFSM/guinode.h b/src/tools/visualStates/guinode.h similarity index 100% rename from src/tools/visualHFSM/guinode.h rename to src/tools/visualStates/guinode.h diff --git a/src/tools/visualHFSM/guinode.py b/src/tools/visualStates/guinode.py similarity index 100% rename from src/tools/visualHFSM/guinode.py rename to src/tools/visualStates/guinode.py diff --git a/src/tools/visualHFSM/guisubautomata.cpp b/src/tools/visualStates/guisubautomata.cpp similarity index 100% rename from src/tools/visualHFSM/guisubautomata.cpp rename to src/tools/visualStates/guisubautomata.cpp diff --git a/src/tools/visualHFSM/guisubautomata.h b/src/tools/visualStates/guisubautomata.h similarity index 100% rename from src/tools/visualHFSM/guisubautomata.h rename to src/tools/visualStates/guisubautomata.h diff --git a/src/tools/visualHFSM/guisubautomata.py b/src/tools/visualStates/guisubautomata.py similarity index 100% rename from src/tools/visualHFSM/guisubautomata.py rename to src/tools/visualStates/guisubautomata.py diff --git a/src/tools/visualHFSM/guitransition.cpp b/src/tools/visualStates/guitransition.cpp similarity index 100% rename from src/tools/visualHFSM/guitransition.cpp rename to src/tools/visualStates/guitransition.cpp diff --git a/src/tools/visualHFSM/guitransition.h b/src/tools/visualStates/guitransition.h similarity index 100% rename from src/tools/visualHFSM/guitransition.h rename to src/tools/visualStates/guitransition.h diff --git a/src/tools/visualHFSM/guitransition.py b/src/tools/visualStates/guitransition.py similarity index 100% rename from src/tools/visualHFSM/guitransition.py rename to src/tools/visualStates/guitransition.py diff --git a/src/tools/visualHFSM/iceinterface.cpp b/src/tools/visualStates/iceinterface.cpp similarity index 100% rename from src/tools/visualHFSM/iceinterface.cpp rename to src/tools/visualStates/iceinterface.cpp diff --git a/src/tools/visualHFSM/iceinterface.h b/src/tools/visualStates/iceinterface.h similarity index 100% rename from src/tools/visualHFSM/iceinterface.h rename to src/tools/visualStates/iceinterface.h diff --git a/src/tools/visualHFSM/main.cpp b/src/tools/visualStates/main.cpp similarity index 87% rename from src/tools/visualHFSM/main.cpp rename to src/tools/visualStates/main.cpp index 0de7560cb..70bef0ab6 100644 --- a/src/tools/visualHFSM/main.cpp +++ b/src/tools/visualStates/main.cpp @@ -20,11 +20,11 @@ */ #include -#include "visualhfsm.h" +#include "visualStates.h" #include int main (int argc, char **argv) { - Glib::RefPtr app = Gtk::Application::create(argc, argv, "jderobot.visualhfsm"); + Glib::RefPtr app = Gtk::Application::create(argc, argv, "jderobot.visualstates"); //Load the Glade file and instiate its widgets: @@ -44,12 +44,12 @@ int main (int argc, char **argv) { } //Get the GtkBuilder-instantiated dialog: - VisualHFSM* visualhfsm = 0; - refBuilder->get_widget_derived("DialogDerived", visualhfsm); - if (visualhfsm) //Start: - app->run(*visualhfsm); + VisualStates* visualStates = 0; + refBuilder->get_widget_derived("DialogDerived", visualStates); + if (visualStates) //Start: + app->run(*visualStates); - delete visualhfsm; + delete visualStates; return 0; } diff --git a/src/tools/visualHFSM/node.cpp b/src/tools/visualStates/node.cpp similarity index 100% rename from src/tools/visualHFSM/node.cpp rename to src/tools/visualStates/node.cpp diff --git a/src/tools/visualHFSM/node.h b/src/tools/visualStates/node.h similarity index 100% rename from src/tools/visualHFSM/node.h rename to src/tools/visualStates/node.h diff --git a/src/tools/visualHFSM/point.cpp b/src/tools/visualStates/point.cpp similarity index 100% rename from src/tools/visualHFSM/point.cpp rename to src/tools/visualStates/point.cpp diff --git a/src/tools/visualHFSM/point.h b/src/tools/visualStates/point.h similarity index 100% rename from src/tools/visualHFSM/point.h rename to src/tools/visualStates/point.h diff --git a/src/tools/visualHFSM/popups/configfiledialog.cpp b/src/tools/visualStates/popups/configfiledialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/configfiledialog.cpp rename to src/tools/visualStates/popups/configfiledialog.cpp diff --git a/src/tools/visualHFSM/popups/configfiledialog.h b/src/tools/visualStates/popups/configfiledialog.h similarity index 100% rename from src/tools/visualHFSM/popups/configfiledialog.h rename to src/tools/visualStates/popups/configfiledialog.h diff --git a/src/tools/visualHFSM/popups/editnodedialog.cpp b/src/tools/visualStates/popups/editnodedialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/editnodedialog.cpp rename to src/tools/visualStates/popups/editnodedialog.cpp diff --git a/src/tools/visualHFSM/popups/editnodedialog.h b/src/tools/visualStates/popups/editnodedialog.h similarity index 100% rename from src/tools/visualHFSM/popups/editnodedialog.h rename to src/tools/visualStates/popups/editnodedialog.h diff --git a/src/tools/visualHFSM/popups/edittransitioncodedialog.cpp b/src/tools/visualStates/popups/edittransitioncodedialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/edittransitioncodedialog.cpp rename to src/tools/visualStates/popups/edittransitioncodedialog.cpp diff --git a/src/tools/visualHFSM/popups/edittransitioncodedialog.h b/src/tools/visualStates/popups/edittransitioncodedialog.h similarity index 100% rename from src/tools/visualHFSM/popups/edittransitioncodedialog.h rename to src/tools/visualStates/popups/edittransitioncodedialog.h diff --git a/src/tools/visualHFSM/popups/edittransitiondialog.cpp b/src/tools/visualStates/popups/edittransitiondialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/edittransitiondialog.cpp rename to src/tools/visualStates/popups/edittransitiondialog.cpp diff --git a/src/tools/visualHFSM/popups/edittransitiondialog.h b/src/tools/visualStates/popups/edittransitiondialog.h similarity index 100% rename from src/tools/visualHFSM/popups/edittransitiondialog.h rename to src/tools/visualStates/popups/edittransitiondialog.h diff --git a/src/tools/visualHFSM/popups/funvardialog.cpp b/src/tools/visualStates/popups/funvardialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/funvardialog.cpp rename to src/tools/visualStates/popups/funvardialog.cpp diff --git a/src/tools/visualHFSM/popups/funvardialog.h b/src/tools/visualStates/popups/funvardialog.h similarity index 100% rename from src/tools/visualHFSM/popups/funvardialog.h rename to src/tools/visualStates/popups/funvardialog.h diff --git a/src/tools/visualHFSM/popups/importdialog.cpp b/src/tools/visualStates/popups/importdialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/importdialog.cpp rename to src/tools/visualStates/popups/importdialog.cpp diff --git a/src/tools/visualHFSM/popups/importdialog.h b/src/tools/visualStates/popups/importdialog.h similarity index 100% rename from src/tools/visualHFSM/popups/importdialog.h rename to src/tools/visualStates/popups/importdialog.h diff --git a/src/tools/visualHFSM/popups/librariesdialog.cpp b/src/tools/visualStates/popups/librariesdialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/librariesdialog.cpp rename to src/tools/visualStates/popups/librariesdialog.cpp diff --git a/src/tools/visualHFSM/popups/librariesdialog.h b/src/tools/visualStates/popups/librariesdialog.h similarity index 100% rename from src/tools/visualHFSM/popups/librariesdialog.h rename to src/tools/visualStates/popups/librariesdialog.h diff --git a/src/tools/visualHFSM/popups/loadfiledialog.cpp b/src/tools/visualStates/popups/loadfiledialog.cpp similarity index 98% rename from src/tools/visualHFSM/popups/loadfiledialog.cpp rename to src/tools/visualStates/popups/loadfiledialog.cpp index 4a9f3340a..ff13001c5 100644 --- a/src/tools/visualHFSM/popups/loadfiledialog.cpp +++ b/src/tools/visualStates/popups/loadfiledialog.cpp @@ -67,7 +67,7 @@ void LoadFileDialog::init () { &LoadFileDialog::on_button_cancel)); Glib::RefPtr filter_xml = Gtk::FileFilter::create(); - filter_xml->set_name("VisualHFSM files"); + filter_xml->set_name("VisualStates files"); filter_xml->add_mime_type("text/xml"); this->filechooserdialog->add_filter(filter_xml); diff --git a/src/tools/visualHFSM/popups/loadfiledialog.h b/src/tools/visualStates/popups/loadfiledialog.h similarity index 100% rename from src/tools/visualHFSM/popups/loadfiledialog.h rename to src/tools/visualStates/popups/loadfiledialog.h diff --git a/src/tools/visualHFSM/popups/renamedialog.cpp b/src/tools/visualStates/popups/renamedialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/renamedialog.cpp rename to src/tools/visualStates/popups/renamedialog.cpp diff --git a/src/tools/visualHFSM/popups/renamedialog.h b/src/tools/visualStates/popups/renamedialog.h similarity index 100% rename from src/tools/visualHFSM/popups/renamedialog.h rename to src/tools/visualStates/popups/renamedialog.h diff --git a/src/tools/visualHFSM/popups/renametransitiondialog.cpp b/src/tools/visualStates/popups/renametransitiondialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/renametransitiondialog.cpp rename to src/tools/visualStates/popups/renametransitiondialog.cpp diff --git a/src/tools/visualHFSM/popups/renametransitiondialog.h b/src/tools/visualStates/popups/renametransitiondialog.h similarity index 100% rename from src/tools/visualHFSM/popups/renametransitiondialog.h rename to src/tools/visualStates/popups/renametransitiondialog.h diff --git a/src/tools/visualHFSM/popups/savefiledialog.cpp b/src/tools/visualStates/popups/savefiledialog.cpp similarity index 98% rename from src/tools/visualHFSM/popups/savefiledialog.cpp rename to src/tools/visualStates/popups/savefiledialog.cpp index aa205e18d..71b809af3 100644 --- a/src/tools/visualHFSM/popups/savefiledialog.cpp +++ b/src/tools/visualStates/popups/savefiledialog.cpp @@ -67,7 +67,7 @@ void SaveFileDialog::init () { &SaveFileDialog::on_button_cancel)); Glib::RefPtr filter_xml = Gtk::FileFilter::create(); - filter_xml->set_name("VisualHFSM files"); + filter_xml->set_name("VisualStates files"); filter_xml->add_mime_type("text/xml"); this->filechooserdialog->add_filter(filter_xml); diff --git a/src/tools/visualHFSM/popups/savefiledialog.h b/src/tools/visualStates/popups/savefiledialog.h similarity index 100% rename from src/tools/visualHFSM/popups/savefiledialog.h rename to src/tools/visualStates/popups/savefiledialog.h diff --git a/src/tools/visualHFSM/popups/timerdialog.cpp b/src/tools/visualStates/popups/timerdialog.cpp similarity index 100% rename from src/tools/visualHFSM/popups/timerdialog.cpp rename to src/tools/visualStates/popups/timerdialog.cpp diff --git a/src/tools/visualHFSM/popups/timerdialog.h b/src/tools/visualStates/popups/timerdialog.h similarity index 100% rename from src/tools/visualHFSM/popups/timerdialog.h rename to src/tools/visualStates/popups/timerdialog.h diff --git a/src/tools/visualHFSM/resources/jderobot.png b/src/tools/visualStates/resources/jderobot.png similarity index 100% rename from src/tools/visualHFSM/resources/jderobot.png rename to src/tools/visualStates/resources/jderobot.png diff --git a/src/tools/visualHFSM/savefile.cpp b/src/tools/visualStates/savefile.cpp similarity index 98% rename from src/tools/visualHFSM/savefile.cpp rename to src/tools/visualStates/savefile.cpp index 8856fdeed..1d438b643 100644 --- a/src/tools/visualHFSM/savefile.cpp +++ b/src/tools/visualStates/savefile.cpp @@ -49,7 +49,7 @@ void SaveFile::init () { #endif //LIBXMLCPP_EXCEPTIONS_ENABLED xmlpp::Document document; - xmlpp::Element* nodeRoot = document.create_root_node("VisualHFSM", "", ""); + xmlpp::Element* nodeRoot = document.create_root_node("VisualStates", "", ""); for ( std::list::iterator subListIterator = this->subautomataList->begin(); subListIterator != this->subautomataList->end(); subListIterator++ ) { // for every subautomata diff --git a/src/tools/visualHFSM/savefile.h b/src/tools/visualStates/savefile.h similarity index 100% rename from src/tools/visualHFSM/savefile.h rename to src/tools/visualStates/savefile.h diff --git a/src/tools/visualStates/setup.sh b/src/tools/visualStates/setup.sh new file mode 100755 index 000000000..1e028848f --- /dev/null +++ b/src/tools/visualStates/setup.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# +# Copyright (c) 2016 +# Author: Samuel Rey +# License: GPLv3 + +#C++ Dependencies +sudo mkdir /usr/local/include/jderobot/visualStates +sudo cp *.h /usr/local/include/jderobot/visualStates +sudo mkdir /usr/local/include/jderobot/visualStates/popups +sudo cp popups/*.h /usr/local/include/jderobot/visualStates/popups/ +sudo mkdir /usr/local/share/jderobot/glade/visualStates +sudo cp gui/* /usr/local/share/jderobot/glade/visualStates/ +sudo cp getinterfaces.sh /usr/local/bin + +#Python Dependencies +sudo mkdir /usr/local/share/jderobot/python/visualStates_py +sudo cp *.py /usr/local/share/jderobot/python/visualStates_py +sudo mkdir /usr/local/share/jderobot/python/visualStates_py/gui +sudo cp gui/*.py /usr/local/share/jderobot/python/visualStates_py/gui + +sudo cp visualStates /usr/local/bin + +echo "Dependencies installed" \ No newline at end of file diff --git a/src/tools/visualHFSM/subautomata.cpp b/src/tools/visualStates/subautomata.cpp similarity index 100% rename from src/tools/visualHFSM/subautomata.cpp rename to src/tools/visualStates/subautomata.cpp diff --git a/src/tools/visualHFSM/subautomata.h b/src/tools/visualStates/subautomata.h similarity index 100% rename from src/tools/visualHFSM/subautomata.h rename to src/tools/visualStates/subautomata.h diff --git a/src/tools/visualHFSM/transition.cpp b/src/tools/visualStates/transition.cpp similarity index 100% rename from src/tools/visualHFSM/transition.cpp rename to src/tools/visualStates/transition.cpp diff --git a/src/tools/visualHFSM/transition.h b/src/tools/visualStates/transition.h similarity index 100% rename from src/tools/visualHFSM/transition.h rename to src/tools/visualStates/transition.h diff --git a/src/tools/visualHFSM/treeModel.py b/src/tools/visualStates/treeModel.py similarity index 100% rename from src/tools/visualHFSM/treeModel.py rename to src/tools/visualStates/treeModel.py diff --git a/src/tools/visualHFSM/visualhfsm.cpp b/src/tools/visualStates/visualStates.cpp similarity index 87% rename from src/tools/visualHFSM/visualhfsm.cpp rename to src/tools/visualStates/visualStates.cpp index 79be3c27a..e3ca62c68 100644 --- a/src/tools/visualHFSM/visualhfsm.cpp +++ b/src/tools/visualStates/visualStates.cpp @@ -19,12 +19,12 @@ * */ -#include "visualhfsm.h" +#include "visualStates.h" /************************************************************* * CONSTRUCTOR *************************************************************/ -VisualHFSM::VisualHFSM ( BaseObjectType* cobject, const Glib::RefPtr& refGlade ) +VisualStates::VisualStates ( BaseObjectType* cobject, const Glib::RefPtr& refGlade ) : Gtk::Dialog(cobject), refBuilder(refGlade) { @@ -63,52 +63,52 @@ VisualHFSM::VisualHFSM ( BaseObjectType* cobject, const Glib::RefPtrimagemenuitem_new->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_new)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_new)); this->imagemenuitem_open->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_open)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_open)); this->imagemenuitem_save->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_save)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_save)); this->imagemenuitem_saveas->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_save_as)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_save_as)); this->imagemenuitem_quit->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_quit)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_quit)); this->imagemenuitem_state->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_state)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_state)); this->imagemenuitem_transition->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_transition)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_transition)); this->imagemenuitem_timer->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_timer)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_timer)); this->imagemenuitem_variables->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_variables)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_variables)); this->imagemenuitem_libraries->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_libraries)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_libraries)); this->imagemenuitem_configfile->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_configfile)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_configfile)); this->imagemenuitem_generatecppcode->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_generate_cpp_code)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_generate_cpp_code)); this->imagemenuitem_compile->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_compile)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_compile)); this->imagemenuitem_generatepythoncode->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_generate_python_code)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_generate_python_code)); this->imagemenuitem_about->signal_activate().connect( - sigc::mem_fun(*this, &VisualHFSM::on_menubar_clicked_about)); + sigc::mem_fun(*this, &VisualStates::on_menubar_clicked_about)); // Of the windows this->scrolledwindow_schema->signal_event().connect( - sigc::mem_fun(*this, &VisualHFSM::on_schema_event)); + sigc::mem_fun(*this, &VisualStates::on_schema_event)); this->pUpButton->signal_clicked().connect(sigc::mem_fun(*this, - &VisualHFSM::on_up_button_clicked)); + &VisualStates::on_up_button_clicked)); // Create the canvas this->canvas = Gtk::manage(new Goocanvas::Canvas()); this->canvas->signal_item_created().connect(sigc::mem_fun(*this, - &VisualHFSM::on_item_created)); + &VisualStates::on_item_created)); // And the treeview's tree model this->refTreeModel = Gtk::TreeStore::create(this->m_Columns); this->treeview->set_model(this->refTreeModel); this->treeview->signal_row_activated().connect( - sigc::mem_fun(*this, &VisualHFSM::on_row_activated)); + sigc::mem_fun(*this, &VisualStates::on_row_activated)); //Add the TreeView's view columns: this->treeview->append_column("ID", this->m_Columns.m_col_id); @@ -169,13 +169,13 @@ VisualHFSM::VisualHFSM ( BaseObjectType* cobject, const Glib::RefPtrlastButton == SAVE_AS) { std::string str(".xml"); if (!this->hasEnding(path, str)) @@ -194,7 +194,7 @@ void VisualHFSM::on_save_file ( std::string path ) { } // Load the specified file -void VisualHFSM::on_load_file ( std::string path ) { +void VisualStates::on_load_file ( std::string path ) { this->filepath = std::string(path); delete this->lfdialog; @@ -220,19 +220,19 @@ void VisualHFSM::on_load_file ( std::string path ) { } // Receive a list of interfaces for the automata -void VisualHFSM::on_config_text ( std::list& listInterfaces ) { +void VisualStates::on_config_text ( std::list& listInterfaces ) { this->listInterfaces = listInterfaces; delete this->cfdialog; } // Receive a list of libraries for the automata -void VisualHFSM::on_additional_libraries ( std::list listLibraries ) { +void VisualStates::on_additional_libraries ( std::list listLibraries ) { this->listLibraries = listLibraries; delete this->ldialog; } // 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 ) { +void VisualStates::on_change_node_name ( int id, std::string name ) { this->changeNameInTreeView(id, name, this->refTreeModel->children()); } @@ -240,17 +240,17 @@ void VisualHFSM::on_change_node_name ( int id, std::string name ) { * INTERNAL METHODS *************************************************************/ // Create a popup menu for transitions -void VisualHFSM::create_menu_transition () { +void VisualStates::create_menu_transition () { this->actionGroupTransition = Gtk::ActionGroup::create(); this->actionGroupTransition->add(Gtk::Action::create("ContextMenu", "Context Menu")); this->actionGroupTransition->add(Gtk::Action::create("ContextRename", "Rename"), - sigc::mem_fun(this, &VisualHFSM::on_menu_transition_rename)); + sigc::mem_fun(this, &VisualStates::on_menu_transition_rename)); this->actionGroupTransition->add(Gtk::Action::create("ContextEdit", "Edit"), - sigc::mem_fun(this, &VisualHFSM::on_menu_transition_edit)); + sigc::mem_fun(this, &VisualStates::on_menu_transition_edit)); this->actionGroupTransition->add(Gtk::Action::create("ContextCode", "Code"), - sigc::mem_fun(this, &VisualHFSM::on_menu_transition_code)); + sigc::mem_fun(this, &VisualStates::on_menu_transition_code)); this->actionGroupTransition->add(Gtk::Action::create("ContextRemove", "Remove"), - sigc::mem_fun(this, &VisualHFSM::on_menu_transition_remove)); + sigc::mem_fun(this, &VisualStates::on_menu_transition_remove)); this->UIManagerTransition = Gtk::UIManager::create(); this->UIManagerTransition->insert_action_group(this->actionGroupTransition); @@ -278,19 +278,19 @@ void VisualHFSM::create_menu_transition () { } // Create a popup menu for states -void VisualHFSM::create_menu_item () { +void VisualStates::create_menu_item () { this->actionGroupItem = Gtk::ActionGroup::create(); this->actionGroupItem->add(Gtk::Action::create("ContextMenu", "Context Menu")); this->actionGroupItem->add(Gtk::Action::create("ContextRename", "Rename"), - sigc::mem_fun(this, &VisualHFSM::on_menu_state_rename)); + sigc::mem_fun(this, &VisualStates::on_menu_state_rename)); this->actionGroupItem->add(Gtk::Action::create("ContextEdit", "Edit"), - sigc::mem_fun(this, &VisualHFSM::on_menu_state_edit)); + sigc::mem_fun(this, &VisualStates::on_menu_state_edit)); this->actionGroupItem->add(Gtk::Action::create("ContextMarkAsInitial", "Mark as initial"), - sigc::mem_fun(this, &VisualHFSM::on_menu_state_markasinitial)); + sigc::mem_fun(this, &VisualStates::on_menu_state_markasinitial)); this->actionGroupItem->add(Gtk::Action::create("ContextCopy", "Copy"), - sigc::mem_fun(this, &VisualHFSM::on_menu_state_copy)); + sigc::mem_fun(this, &VisualStates::on_menu_state_copy)); this->actionGroupItem->add(Gtk::Action::create("ContextRemove", "Remove"), - sigc::mem_fun(this, &VisualHFSM::on_menu_state_remove)); + sigc::mem_fun(this, &VisualStates::on_menu_state_remove)); this->UIManagerItem = Gtk::UIManager::create(); this->UIManagerItem->insert_action_group(this->actionGroupItem); @@ -318,11 +318,11 @@ void VisualHFSM::create_menu_item () { } // Create a popup menu for paste states in the canvas -void VisualHFSM::create_menu_paste () { +void VisualStates::create_menu_paste () { this->actionGroupPaste = Gtk::ActionGroup::create(); this->actionGroupPaste->add(Gtk::Action::create("ContextMenu", "Context Menu")); this->actionGroupPaste->add(Gtk::Action::create("ContextPaste", "Paste"), - sigc::mem_fun(this, &VisualHFSM::on_menu_canvas_paste)); + sigc::mem_fun(this, &VisualStates::on_menu_canvas_paste)); this->UIManagerPaste = Gtk::UIManager::create(); this->UIManagerPaste->insert_action_group(this->actionGroupPaste); @@ -347,7 +347,7 @@ void VisualHFSM::create_menu_paste () { } // Create a new state, receiving the ID of the subautomata son -void VisualHFSM::create_new_state ( int idSubautomataSon ) { +void VisualStates::create_new_state ( int idSubautomataSon ) { if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Creating state with ID: " << this->idguinode << END_COLOR << std::endl; @@ -382,7 +382,7 @@ void VisualHFSM::create_new_state ( int idSubautomataSon ) { } // Create a new transition between 'item' and 'lastItem' -void VisualHFSM::create_new_transition ( const Glib::RefPtr& item ) { +void VisualStates::create_new_transition ( const Glib::RefPtr& item ) { if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Creating transition" << END_COLOR << std::endl; @@ -424,7 +424,7 @@ void VisualHFSM::create_new_transition ( const Glib::RefPtr& it } // Create a new transition when loading an xml file -void VisualHFSM::create_new_transition ( Point origin, Point final, Point midpoint, int idTransition ) { +void VisualStates::create_new_transition ( Point origin, Point final, Point midpoint, int idTransition ) { if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Creating transition" << END_COLOR << std::endl; @@ -462,22 +462,22 @@ void VisualHFSM::create_new_transition ( Point origin, Point final, Point midpoi * OF THE MENUS (TRANSITIONS) *************************************************************/ // Rename the selected transition -void VisualHFSM::on_menu_transition_rename () { +void VisualStates::on_menu_transition_rename () { this->currentSubautomata->renameGuiTransition(this->selectedItem); } // Edit the selected transition -void VisualHFSM::on_menu_transition_edit () { +void VisualStates::on_menu_transition_edit () { this->currentSubautomata->editGuiTransition(this->selectedItem); } // Edit the code of the selected transition -void VisualHFSM::on_menu_transition_code () { +void VisualStates::on_menu_transition_code () { this->currentSubautomata->editGuiTransitionCode(this->selectedItem); } // Remove the selected transition -void VisualHFSM::on_menu_transition_remove () { +void VisualStates::on_menu_transition_remove () { if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Removing transition..." << END_COLOR << std::endl; @@ -500,7 +500,7 @@ void VisualHFSM::on_menu_transition_remove () { * OF THE MENUS (STATES) *************************************************************/ // Rename a state -void VisualHFSM::on_menu_state_rename () { +void VisualStates::on_menu_state_rename () { this->copyPressed = false; std::list* listGuinodes = this->currentSubautomata->getListGuiNodes(); @@ -516,31 +516,31 @@ void VisualHFSM::on_menu_state_rename () { this->rdialog = new RenameDialog(&*nodeListIterator); this->rdialog->init(); this->rdialog->signal_change_node().connect(sigc::mem_fun(this, - &VisualHFSM::on_change_node_name)); + &VisualStates::on_change_node_name)); } } // Edit the code of a state -void VisualHFSM::on_menu_state_edit () { +void VisualStates::on_menu_state_edit () { this->copyPressed = false; this->currentSubautomata->editGuiNode(this->selectedItem); } // Mark the state as initial -void VisualHFSM::on_menu_state_markasinitial () { +void VisualStates::on_menu_state_markasinitial () { this->copyPressed = false; this->currentSubautomata->markGuiNodeAsInitial(this->selectedItem); } // Just put the 'copyPressed' variable to true -void VisualHFSM::on_menu_state_copy () { +void VisualStates::on_menu_state_copy () { this->copyPressed = true; } // Remove a state -void VisualHFSM::on_menu_state_remove () { +void VisualStates::on_menu_state_remove () { if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Removing state..." << END_COLOR << std::endl; @@ -559,7 +559,7 @@ void VisualHFSM::on_menu_state_remove () { } // Paste a state -void VisualHFSM::on_menu_canvas_paste () { +void VisualStates::on_menu_canvas_paste () { this->copyPressed = true; GuiNode* gnode = this->currentSubautomata->getGuiNode(this->selectedItem); this->nameNode = gnode->getName(); @@ -573,7 +573,7 @@ void VisualHFSM::on_menu_canvas_paste () { * OF THE TREEVIEW *************************************************************/ // Fills the treeview with a new state -bool VisualHFSM::fillTreeView ( std::string nameNode, Gtk::TreeModel::Children child, int idNodeFather ) { +bool VisualStates::fillTreeView ( std::string nameNode, Gtk::TreeModel::Children child, int idNodeFather ) { bool cont = true; Gtk::TreeModel::Children::iterator iter = child.begin(); while ( cont && (iter != child.end()) ) { @@ -592,7 +592,7 @@ bool VisualHFSM::fillTreeView ( std::string nameNode, Gtk::TreeModel::Children c return cont; } -bool VisualHFSM::clearTreeView (){ +bool VisualStates::clearTreeView (){ Gtk::TreeModel::Children children = this->refTreeModel->children(); Gtk::TreeModel::Children::iterator iter = children.begin(); @@ -606,7 +606,7 @@ bool VisualHFSM::clearTreeView (){ } // Remove from the treeview -bool VisualHFSM::removeFromTreeView ( int id, Gtk::TreeModel::Children child ) { +bool VisualStates::removeFromTreeView ( int id, Gtk::TreeModel::Children child ) { bool cont = true; Gtk::TreeModel::Children::iterator iter = child.begin(); while ( cont && (iter != child.end()) ) { @@ -624,7 +624,7 @@ bool VisualHFSM::removeFromTreeView ( int id, Gtk::TreeModel::Children child ) { } // Change a name of a state in the treeview -bool VisualHFSM::changeNameInTreeView ( int id, std::string nameNode, Gtk::TreeModel::Children child ) { +bool VisualStates::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()) ) { @@ -646,7 +646,7 @@ bool VisualHFSM::changeNameInTreeView ( int id, std::string nameNode, Gtk::TreeM *************************************************************/ // Schema events: create an state, goes up to the subautomata father // and shows the popup menu paste -bool VisualHFSM::on_schema_event ( GdkEvent* event ) { +bool VisualStates::on_schema_event ( GdkEvent* event ) { if ((event->button.x != 0) && (event->button.y != 0)) { this->event_x = event->button.x; this->event_y = event->button.y; @@ -672,7 +672,7 @@ bool VisualHFSM::on_schema_event ( GdkEvent* event ) { } // Method called when an item is created, both states and transitions -void VisualHFSM::on_item_created ( const Glib::RefPtr& item, +void VisualStates::on_item_created ( const Glib::RefPtr& item, const Glib::RefPtr& /* model */) { if (this->state == NORMAL) { Glib::RefPtr group = Glib::RefPtr::cast_dynamic(item); @@ -680,15 +680,15 @@ void VisualHFSM::on_item_created ( const Glib::RefPtr& item, return; item->signal_button_press_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_item_button_press_event)); + sigc::mem_fun(this, &VisualStates::on_item_button_press_event)); item->signal_button_release_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_item_button_release_event)); + sigc::mem_fun(this, &VisualStates::on_item_button_release_event)); item->signal_motion_notify_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_item_motion_notify_event)); + sigc::mem_fun(this, &VisualStates::on_item_motion_notify_event)); item->signal_enter_notify_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_item_enter_notify_event)); + sigc::mem_fun(this, &VisualStates::on_item_enter_notify_event)); item->signal_leave_notify_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_item_leave_notify_event)); + sigc::mem_fun(this, &VisualStates::on_item_leave_notify_event)); if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Item NORMAL created" << END_COLOR << std::endl; @@ -700,7 +700,7 @@ void VisualHFSM::on_item_created ( const Glib::RefPtr& item, return; item->signal_enter_notify_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_item_enter_notify_event)); + sigc::mem_fun(this, &VisualStates::on_item_enter_notify_event)); if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Item INIT created" << END_COLOR << std::endl; @@ -739,15 +739,15 @@ void VisualHFSM::on_item_created ( const Glib::RefPtr& item, return; item->signal_button_press_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_transition_button_press_event)); + sigc::mem_fun(this, &VisualStates::on_transition_button_press_event)); item->signal_button_release_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_transition_button_release_event)); + sigc::mem_fun(this, &VisualStates::on_transition_button_release_event)); item->signal_motion_notify_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_transition_motion_notify_event)); + sigc::mem_fun(this, &VisualStates::on_transition_motion_notify_event)); item->signal_enter_notify_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_transition_enter_notify_event)); + sigc::mem_fun(this, &VisualStates::on_transition_enter_notify_event)); item->signal_leave_notify_event().connect( - sigc::mem_fun(this, &VisualHFSM::on_transition_leave_notify_event)); + sigc::mem_fun(this, &VisualStates::on_transition_leave_notify_event)); if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Item TRANS_MIDPOINT created" << END_COLOR << std::endl; @@ -760,7 +760,7 @@ void VisualHFSM::on_item_created ( const Glib::RefPtr& item, // Button press events: goes deep to the subautomata child // or shows the popup menu for a state -bool VisualHFSM::on_item_button_press_event ( const Glib::RefPtr& item, +bool VisualStates::on_item_button_press_event ( const Glib::RefPtr& item, GdkEventButton* event ) { if ((event->button == 1) && item) { if (event->type == GDK_2BUTTON_PRESS) { @@ -811,7 +811,7 @@ bool VisualHFSM::on_item_button_press_event ( const Glib::RefPtr& item, +bool VisualStates::on_item_button_release_event ( const Glib::RefPtr& item, GdkEventButton* event) { if ((event->button == 1)) { dragging.reset(); @@ -836,7 +836,7 @@ bool VisualHFSM::on_item_button_release_event ( const Glib::RefPtr& item, +bool VisualStates::on_item_motion_notify_event ( const Glib::RefPtr& item, GdkEventMotion* event) { if (item && dragging && (item == dragging)) { double new_x = event->x; @@ -850,7 +850,7 @@ bool VisualHFSM::on_item_motion_notify_event ( const Glib::RefPtr& item, +bool VisualStates::on_item_enter_notify_event ( const Glib::RefPtr& item, GdkEventCrossing* event) { if (item) { if (this->state == ALL) { @@ -867,7 +867,7 @@ bool VisualHFSM::on_item_enter_notify_event ( const Glib::RefPtr& item, +bool VisualStates::on_item_leave_notify_event ( const Glib::RefPtr& item, GdkEventCrossing* event) { if (item) { if (DEBUG) @@ -880,7 +880,7 @@ bool VisualHFSM::on_item_leave_notify_event ( const Glib::RefPtr& item, +bool VisualStates::on_transition_button_press_event ( const Glib::RefPtr& item, GdkEventButton* event ) { if ((event->button == 1) && item && (event->type == GDK_BUTTON_PRESS)) { dragging = item; @@ -903,7 +903,7 @@ bool VisualHFSM::on_transition_button_press_event ( const Glib::RefPtr& item, +bool VisualStates::on_transition_button_release_event ( const Glib::RefPtr& item, GdkEventButton* event) { if (event->button == 1) dragging.reset(); @@ -912,7 +912,7 @@ bool VisualHFSM::on_transition_button_release_event ( const Glib::RefPtr& item, +bool VisualStates::on_transition_motion_notify_event ( const Glib::RefPtr& item, GdkEventMotion* event) { if (item && dragging && (item == dragging)) { double new_x = event->x; @@ -925,7 +925,7 @@ bool VisualHFSM::on_transition_motion_notify_event ( const Glib::RefPtr& item, +bool VisualStates::on_transition_enter_notify_event ( const Glib::RefPtr& item, GdkEventCrossing* event) { if (item) { if (this->state == NONE) { @@ -940,7 +940,7 @@ bool VisualHFSM::on_transition_enter_notify_event ( const Glib::RefPtr& item, +bool VisualStates::on_transition_leave_notify_event ( const Glib::RefPtr& item, GdkEventCrossing* event) { if (item) { if (DEBUG) @@ -956,7 +956,7 @@ bool VisualHFSM::on_transition_leave_notify_event ( const Glib::RefPtrremoveAllGui(); this->clearTreeView(); this->removeAllSubautomata(); @@ -975,7 +975,7 @@ void VisualHFSM::on_menubar_clicked_new () { } // Open an automata previously saved -void VisualHFSM::on_menubar_clicked_open () { +void VisualStates::on_menubar_clicked_open () { lastButton = OPEN; if (DEBUG) @@ -984,11 +984,11 @@ void VisualHFSM::on_menubar_clicked_open () { this->lfdialog = new LoadFileDialog(); this->lfdialog->init(); this->lfdialog->signal_path().connect(sigc::mem_fun(this, - &VisualHFSM::on_load_file)); + &VisualStates::on_load_file)); } // Save an automata -void VisualHFSM::on_menubar_clicked_save () { +void VisualStates::on_menubar_clicked_save () { lastButton = SAVE; if (DEBUG) @@ -1001,7 +1001,7 @@ void VisualHFSM::on_menubar_clicked_save () { } // Save as (if you want to change the name and/or location) -void VisualHFSM::on_menubar_clicked_save_as () { +void VisualStates::on_menubar_clicked_save_as () { lastButton = SAVE_AS; if (DEBUG) @@ -1010,16 +1010,16 @@ void VisualHFSM::on_menubar_clicked_save_as () { this->sfdialog = new SaveFileDialog(); this->sfdialog->init(); this->sfdialog->signal_path().connect(sigc::mem_fun(this, - &VisualHFSM::on_save_file)); + &VisualStates::on_save_file)); } // Close the application -void VisualHFSM::on_menubar_clicked_quit () { +void VisualStates::on_menubar_clicked_quit () { this->hide(); // hide() will cause main::run() to end } // New state to be generated -void VisualHFSM::on_menubar_clicked_state () { +void VisualStates::on_menubar_clicked_state () { lastButton = STATE; if (DEBUG) @@ -1027,7 +1027,7 @@ void VisualHFSM::on_menubar_clicked_state () { } // New transition to be generated -void VisualHFSM::on_menubar_clicked_transition () { +void VisualStates::on_menubar_clicked_transition () { lastButton = TRANSITION; transitionsCounter = 0; @@ -1036,7 +1036,7 @@ void VisualHFSM::on_menubar_clicked_transition () { } // Insert the timer for this automata -void VisualHFSM::on_menubar_clicked_timer () { +void VisualStates::on_menubar_clicked_timer () { lastButton = TIMER; if (DEBUG) @@ -1047,7 +1047,7 @@ void VisualHFSM::on_menubar_clicked_timer () { } // Insert variables and functions for this automata -void VisualHFSM::on_menubar_clicked_variables () { +void VisualStates::on_menubar_clicked_variables () { lastButton = VARIABLES; if (DEBUG) @@ -1058,7 +1058,7 @@ void VisualHFSM::on_menubar_clicked_variables () { } // Insert libraries for the project -void VisualHFSM::on_menubar_clicked_libraries () { +void VisualStates::on_menubar_clicked_libraries () { lastButton = LIBRARIES; if (DEBUG) @@ -1067,11 +1067,11 @@ void VisualHFSM::on_menubar_clicked_libraries () { this->ldialog = new LibrariesDialog(this->listLibraries); this->ldialog->init(); this->ldialog->signal_libraries().connect(sigc::mem_fun(this, - &VisualHFSM::on_additional_libraries)); + &VisualStates::on_additional_libraries)); } // Create a new config file for the project -void VisualHFSM::on_menubar_clicked_configfile () { +void VisualStates::on_menubar_clicked_configfile () { lastButton = VARIABLES; if (DEBUG) @@ -1080,10 +1080,10 @@ void VisualHFSM::on_menubar_clicked_configfile () { this->cfdialog = new ConfigFileDialog(this->listInterfaces, this->mapInterfacesHeader); this->cfdialog->init(); this->cfdialog->signal_config().connect(sigc::mem_fun(this, - &VisualHFSM::on_config_text)); + &VisualStates::on_config_text)); } -int VisualHFSM::prepareGenerateCode(){ +int VisualStates::prepareGenerateCode(){ if (this->filepath.compare(std::string("")) == 0){ // if it is not saved, save it please! std::cout << BEGIN_YELLOW << VISUAL << "You must save the project first" << END_COLOR << std::endl; @@ -1106,7 +1106,7 @@ int VisualHFSM::prepareGenerateCode(){ } // Generate the code for the project -void VisualHFSM::on_menubar_clicked_generate_cpp_code () { +void VisualStates::on_menubar_clicked_generate_cpp_code () { lastButton = GENERATE_CPP_CODE; if (this->prepareGenerateCode() == 0){ @@ -1143,7 +1143,7 @@ void VisualHFSM::on_menubar_clicked_generate_cpp_code () { } // Compile the project -void VisualHFSM::on_menubar_clicked_compile () { +void VisualStates::on_menubar_clicked_compile () { lastButton = COMPILE; std::string cpppath(this->filepath); @@ -1184,7 +1184,7 @@ void VisualHFSM::on_menubar_clicked_compile () { } -void VisualHFSM::on_menubar_clicked_generate_python_code (){ +void VisualStates::on_menubar_clicked_generate_python_code (){ this->lastButton = GENERATE_PYTHON_CODE; if (this->prepareGenerateCode() == 0){ @@ -1220,7 +1220,7 @@ void VisualHFSM::on_menubar_clicked_generate_python_code (){ } } -void VisualHFSM::on_row_activated(const Gtk::TreeModel::Path& path, +void VisualStates::on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* /* column */){ Gtk::TreeModel::iterator iter = this->refTreeModel->get_iter(path); @@ -1244,7 +1244,7 @@ void VisualHFSM::on_row_activated(const Gtk::TreeModel::Path& path, } } -GuiSubautomata* VisualHFSM::getSubautomataByNodeName(std::string name){ +GuiSubautomata* VisualStates::getSubautomataByNodeName(std::string name){ std::list::iterator subIterator = this->subautomataList.begin(); while (subIterator != this->subautomataList.end()){ @@ -1262,7 +1262,7 @@ GuiSubautomata* VisualHFSM::getSubautomataByNodeName(std::string name){ // About // TODO: generate it -void VisualHFSM::on_menubar_clicked_about () { +void VisualStates::on_menubar_clicked_about () { lastButton = COMPILE; if (DEBUG) @@ -1270,7 +1270,7 @@ void VisualHFSM::on_menubar_clicked_about () { } // Goes up to the upper level of the automata (pressing the middle button of the mouse) -void VisualHFSM::on_menubar_clicked_up () { // Deprecated +void VisualStates::on_menubar_clicked_up () { // Deprecated lastButton = UP; if (DEBUG) @@ -1302,7 +1302,7 @@ void VisualHFSM::on_menubar_clicked_up () { // Deprecated } } -void VisualHFSM::on_up_button_clicked (){ +void VisualStates::on_up_button_clicked (){ int fatherId = this->currentSubautomata->getIdFather(); if (fatherId != 0){ @@ -1331,7 +1331,7 @@ void VisualHFSM::on_up_button_clicked (){ * IN GENERAL *************************************************************/ // Get a specified subautomata -GuiSubautomata* VisualHFSM::getSubautomata ( int idSubautomata ) { +GuiSubautomata* VisualStates::getSubautomata ( int idSubautomata ) { if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Getting subautomata with ID: " << idSubautomata << END_COLOR << std::endl; @@ -1347,7 +1347,7 @@ GuiSubautomata* VisualHFSM::getSubautomata ( int idSubautomata ) { } // Get a specified subautomata with an idFather -GuiSubautomata* VisualHFSM::getSubautomataWithIdFather ( int idFather ) { +GuiSubautomata* VisualStates::getSubautomataWithIdFather ( int idFather ) { if (DEBUG) std::cout << BEGIN_GREEN << VISUAL << "Getting subautomata with ID father: " << idFather << END_COLOR << std::endl; @@ -1363,7 +1363,7 @@ GuiSubautomata* VisualHFSM::getSubautomataWithIdFather ( int idFather ) { } // Load a subautomata -int VisualHFSM::loadSubautomata ( std::list subList ) { +int VisualStates::loadSubautomata ( std::list subList ) { int maxId = 0; int maxNodeId = 0; int maxTransId = 0; @@ -1455,7 +1455,7 @@ int VisualHFSM::loadSubautomata ( std::list subList ) { } // Remove the GUI -void VisualHFSM::removeAllGui () { +void VisualStates::removeAllGui () { for ( std::list::iterator subListIterator = this->subautomataList.begin(); subListIterator != this->subautomataList.end(); subListIterator++ ) { std::list* nodeList = subListIterator->getListGuiNodes(); @@ -1478,7 +1478,7 @@ void VisualHFSM::removeAllGui () { } // Remove all subautomata -void VisualHFSM::removeAllSubautomata () { +void VisualStates::removeAllSubautomata () { for ( std::list::iterator subListIterator = this->subautomataList.begin(); subListIterator != this->subautomataList.end(); subListIterator++ ) subListIterator->removeAll(); @@ -1487,7 +1487,7 @@ void VisualHFSM::removeAllSubautomata () { } // Get an ID of a node with a specified subautomata -int VisualHFSM::getIdNodeInSubautomata ( int subautomataId ) { +int VisualStates::getIdNodeInSubautomata ( int subautomataId ) { std::list::iterator subListIterator = this->subautomataList.begin(); while ( (subListIterator->getId() != subautomataId) && (subListIterator != this->subautomataList.end()) ) @@ -1503,7 +1503,7 @@ int VisualHFSM::getIdNodeInSubautomata ( int subautomataId ) { } // Get an ID of a subautomata with a scpecified node -int VisualHFSM::getIdSubautomataWithNode ( int idNode ) { +int VisualStates::getIdSubautomataWithNode ( int idNode ) { int id = 0; std::list::iterator subListIterator = this->subautomataList.begin(); while ( (id == 0) && (subListIterator != this->subautomataList.end()) ) { @@ -1522,7 +1522,7 @@ int VisualHFSM::getIdSubautomataWithNode ( int idNode ) { } // Remove a node and its associated transitions -void VisualHFSM::remove ( GuiSubautomata* guisub, GuiNode* gnode ) { +void VisualStates::remove ( GuiSubautomata* guisub, GuiNode* gnode ) { root->remove_child(root->find_child(gnode->getEllipse())); root->remove_child(root->find_child(gnode->getEllipseInitial())); root->remove_child(root->find_child(gnode->getText())); @@ -1543,7 +1543,7 @@ void VisualHFSM::remove ( GuiSubautomata* guisub, GuiNode* gnode ) { } // Removes a node recursively (including its subautomata children) -void VisualHFSM::removeRecursively ( GuiSubautomata* guisub, GuiNode* gnode ) { +void VisualStates::removeRecursively ( GuiSubautomata* guisub, GuiNode* gnode ) { int idSubautomataSon = gnode->getIdSubautomataSon(); if (idSubautomataSon != 0) { GuiSubautomata* subautomata = this->getSubautomata(idSubautomataSon); @@ -1558,7 +1558,7 @@ void VisualHFSM::removeRecursively ( GuiSubautomata* guisub, GuiNode* gnode ) { } // Check if a string has the specified ending (usually for .xml endings) -bool VisualHFSM::hasEnding ( std::string const &fullString, std::string const &ending ) { +bool VisualStates::hasEnding ( std::string const &fullString, std::string const &ending ) { if (fullString.length() >= ending.length()) { return (0 == fullString.compare (fullString.length() - ending.length(), ending.length(), ending)); @@ -1568,7 +1568,7 @@ bool VisualHFSM::hasEnding ( std::string const &fullString, std::string const &e } // Replace in the 'str', 'from' to 'to' -bool VisualHFSM::replace ( std::string& str, const std::string& from, const std::string& to) { +bool VisualStates::replace ( std::string& str, const std::string& from, const std::string& to) { size_t start_pos = str.find(from); if (start_pos == std::string::npos) return false; @@ -1579,7 +1579,7 @@ bool VisualHFSM::replace ( std::string& str, const std::string& from, const std: } // Replace in 'str', 'character' to 'to' -bool VisualHFSM::replaceFile ( std::string& str, const std::string& character, std::string to ) { +bool VisualStates::replaceFile ( std::string& str, const std::string& character, std::string to ) { size_t last_pos = str.find_last_of(character); if (last_pos == std::string::npos) return false; @@ -1590,7 +1590,7 @@ bool VisualHFSM::replaceFile ( std::string& str, const std::string& character, s } // Check if it is all ok -bool VisualHFSM::checkAll () { +bool VisualStates::checkAll () { // The interfaces are all different for ( std::list::iterator first = this->listInterfaces.begin(); first != this->listInterfaces.end(); first++ ) { diff --git a/src/tools/visualHFSM/visualhfsm.h b/src/tools/visualStates/visualStates.h similarity index 97% rename from src/tools/visualHFSM/visualhfsm.h rename to src/tools/visualStates/visualStates.h index f087a30c1..175a266da 100644 --- a/src/tools/visualHFSM/visualhfsm.h +++ b/src/tools/visualStates/visualStates.h @@ -19,8 +19,8 @@ * */ -#ifndef VISUALHFSM_H -#define VISUALHFSM_H +#ifndef VISUALSTATES_H +#define VISUALSTATES_H #include #include @@ -69,13 +69,13 @@ typedef enum TypeInitial { } TypeInitial; // Definition of this class -class VisualHFSM : public Gtk::Dialog { +class VisualStates : public Gtk::Dialog { public: // Constructor - VisualHFSM ( BaseObjectType* cobject, const Glib::RefPtr& refGlade ); + VisualStates ( BaseObjectType* cobject, const Glib::RefPtr& refGlade ); // Destructor - virtual ~VisualHFSM (); + virtual ~VisualStates (); // Methods for signals from save and load files void on_save_file ( std::string path ); @@ -277,6 +277,6 @@ class VisualHFSM : public Gtk::Dialog { bool replaceFile ( std::string& str, const std::string& character, std::string to ); bool checkAll (); -}; // Class VisualHFSM +}; // Class VisualStates -#endif // VISUALHFSM_H +#endif // VISUALSTATES_H diff --git a/src/tools/visualHFSM/xmlparser.cpp b/src/tools/visualStates/xmlparser.cpp similarity index 98% rename from src/tools/visualHFSM/xmlparser.cpp rename to src/tools/visualStates/xmlparser.cpp index 3da2689b6..20cededf6 100644 --- a/src/tools/visualHFSM/xmlparser.cpp +++ b/src/tools/visualStates/xmlparser.cpp @@ -25,7 +25,7 @@ * CONSTRUCTOR *************************************************************/ MySaxParser::MySaxParser () : xmlpp::SaxParser() { - this->mapStringValues["VisualHFSM"] = E_VISUALHFSM; + this->mapStringValues["VisualStates"] = E_VISUALSTATES; this->mapStringValues["SubAutomata"] = E_SUBAUTOMATA; this->mapStringValues["state"] = E_STATE; this->mapStringValues["posx"] = E_POSX; @@ -86,8 +86,8 @@ void MySaxParser::on_end_document () { void MySaxParser::on_start_element ( const Glib::ustring& name, const AttributeList& attributes ) { switch (this->mapStringValues[name.c_str()]) { - case E_VISUALHFSM : - this->option = E_VISUALHFSM; + case E_VISUALSTATES : + this->option = E_VISUALSTATES; break; case E_SUBAUTOMATA: { int idSubautomata, idFather; @@ -260,7 +260,7 @@ void MySaxParser::on_end_element ( const Glib::ustring& name ) { void MySaxParser::on_characters ( const Glib::ustring& text ) { switch (this->option) { - case E_VISUALHFSM: + case E_VISUALSTATES: break; case E_SUBAUTOMATA: break; diff --git a/src/tools/visualHFSM/xmlparser.h b/src/tools/visualStates/xmlparser.h similarity index 99% rename from src/tools/visualHFSM/xmlparser.h rename to src/tools/visualStates/xmlparser.h index 5461bd2a6..20557bccd 100644 --- a/src/tools/visualHFSM/xmlparser.h +++ b/src/tools/visualStates/xmlparser.h @@ -35,7 +35,7 @@ #include "iceinterface.h" typedef enum Element { - E_VISUALHFSM, + E_VISUALSTATES, E_SUBAUTOMATA, E_STATE, E_POSX,