DecisionDrawingArea : refactoring tasks

.gitignore

@@ -54,3 +54,125 @@ vle.output/cmake/doxygen-modeling.conf.in.bak
 vle.output/cmake/doxygen-sources.conf.in.bak
 vle.output/doc/html/
 vle.output/plugins/
+
+ext.muparser/buildvle/
+test/
+vle.examples/buildvle/
+vle.examples/cmake/FindGVLE.cmake
+vle.examples/cmake/FindGVLE_DEPS.cmake
+vle.examples/cmake/FindVLE.cmake
+vle.examples/cmake/FindVLE_DEPS.cmake
+vle.examples/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.examples/data/file.dat
+vle.examples/doc/file.doc
+vle.examples/exp/empty.vpz
+vle.examples/src/Simple.cpp
+vle.examples/test/test.cpp
+vle.extension.celldevs/buildvle/
+vle.extension.celldevs/cmake/FindGVLE.cmake
+vle.extension.celldevs/cmake/FindGVLE_DEPS.cmake
+vle.extension.celldevs/cmake/FindVLE.cmake
+vle.extension.celldevs/cmake/FindVLE_DEPS.cmake
+vle.extension.celldevs/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.celldevs/data/file.dat
+vle.extension.celldevs/doc/file.doc
+vle.extension.celldevs/exp/empty.vpz
+vle.extension.celldevs/src/Simple.cpp
+vle.extension.cellqss/buildvle/
+vle.extension.cellqss/cmake/FindGVLE.cmake
+vle.extension.cellqss/cmake/FindGVLE_DEPS.cmake
+vle.extension.cellqss/cmake/FindVLE.cmake
+vle.extension.cellqss/cmake/FindVLE_DEPS.cmake
+vle.extension.cellqss/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.cellqss/data/file.dat
+vle.extension.cellqss/doc/file.doc
+vle.extension.cellqss/exp/empty.vpz
+vle.extension.cellqss/src/Simple.cpp
+e.extension.decision/buildvle/
+vle.extension.decision/cmake/FindGVLE.cmake
+vle.extension.decision/cmake/FindGVLE_DEPS.cmake
+vle.extension.decision/cmake/FindVLE.cmake
+vle.extension.decision/cmake/FindVLE_DEPS.cmake
+vle.extension.decision/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.decision/data/file.dat
+vle.extension.decision/doc/file.doc
+vle.extension.decision/exp/empty.vpz
+vle.extension.decision/src/Simple.cpp
+vle.extension.decision/src/vle/gvle/modeling/decision/.metadata/
+vle.extension.decision/src/vle/gvle/modeling/decision/DecisionDrawingArea.cpp~
+vle.extension.decision/src/vle/gvle/modeling/decision/DecisionDrawingArea.hpp~
+vle.extension.decision/src/vle/gvle/modeling/decision/build/
+vle.extension.difference-equation/buildvle/
+vle.extension.difference-equation/cmake/FindGVLE.cmake
+vle.extension.difference-equation/cmake/FindGVLE_DEPS.cmake
+vle.extension.difference-equation/cmake/FindVLE.cmake
+vle.extension.difference-equation/cmake/FindVLE_DEPS.cmake
+vle.extension.difference-equation/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.difference-equation/data/file.dat
+vle.extension.difference-equation/doc/file.doc
+vle.extension.difference-equation/exp/empty.vpz
+vle.extension.difference-equation/src/Simple.cpp
+vle.extension.difference-equation/test/test.cpp
+vle.extension.differential-equation/CMakeLists.txt~
+vle.extension.differential-equation/buildvle/
+vle.extension.differential-equation/cmake/FindGVLE.cmake
+vle.extension.differential-equation/cmake/FindGVLE_DEPS.cmake
+vle.extension.differential-equation/cmake/FindVLE.cmake
+vle.extension.differential-equation/cmake/FindVLE_DEPS.cmake
+vle.extension.differential-equation/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.differential-equation/data/
+vle.extension.differential-equation/doc/file.doc
+vle.extension.differential-equation/exp/empty.vpz
+vle.extension.differential-equation/src/Simple.cpp
+vle.extension.differential-equation/test/test.cpp
+vle.extension.differential-equation/test/test_Euler.cpp~
+vle.extension.differential-equation/test/test_Euler_perturbation.cpp~
+vle.extension.dsdevs/buildvle/
+vle.extension.dsdevs/cmake/FindGVLE.cmake
+vle.extension.dsdevs/cmake/FindGVLE_DEPS.cmake
+vle.extension.dsdevs/cmake/FindVLE.cmake
+vle.extension.dsdevs/cmake/FindVLE_DEPS.cmake
+vle.extension.dsdevs/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.dsdevs/data/file.dat
+vle.extension.dsdevs/doc/file.doc
+vle.extension.dsdevs/exp/empty.vpz
+vle.extension.dsdevs/src/Simple.cpp
+vle.extension.fsa/buildvle/
+vle.extension.fsa/cmake/FindGVLE.cmake
+vle.extension.fsa/cmake/FindGVLE_DEPS.cmake
+vle.extension.fsa/cmake/FindVLE.cmake
+vle.extension.fsa/cmake/FindVLE_DEPS.cmake
+vle.extension.fsa/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.fsa/data/file.dat
+vle.extension.fsa/doc/file.doc
+vle.extension.fsa/exp/empty.vpz
+vle.extension.fsa/src/Simple.cpp
+vle.extension.petrinet/buildvle/
+vle.extension.petrinet/cmake/FindGVLE.cmake
+vle.extension.petrinet/cmake/FindGVLE_DEPS.cmake
+vle.extension.petrinet/cmake/FindVLE.cmake
+vle.extension.petrinet/cmake/FindVLE_DEPS.cmake
+vle.extension.petrinet/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.extension.petrinet/src/Simple.cpp
+vle.forrester/buildvle/
+vle.forrester/cmake/FindGVLE.cmake
+vle.forrester/cmake/FindGVLE_DEPS.cmake
+vle.forrester/cmake/FindVLE.cmake
+vle.forrester/cmake/FindVLE_DEPS.cmake
+vle.forrester/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.forrester/data/
+vle.forrester/doc/
+vle.forrester/exp/
+vle.forrester/src/Simple.cpp
+vle.forrester/test/
+vle.output/buildvle/
+vle.output/cmake/FindGVLE.cmake
+vle.output/cmake/FindGVLE_DEPS.cmake
+vle.output/cmake/FindVLE.cmake
+vle.output/cmake/FindVLE_DEPS.cmake
+vle.output/cmake/VleCheckAndDeclareGeneratedModelsConfig.cmake
+vle.output/data/file.dat
+vle.output/doc/file.doc
+vle.output/exp/empty.vpz
+vle.output/src/Simple.cpp
+vle.output/test/test.cpp

vle.extension.decision/src/vle/gvle/modeling/decision/CMakeLists.txt

@@ -1,6 +1,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src ${VLE_INCLUDE_DIRS}
   ${GVLE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
-  ${GTKSOURCEVIEWMM_INCLUDE_DIRS})
+  ${GTKSOURCEVIEWMM_INCLUDE_DIRS}
+)
 
 LINK_DIRECTORIES(${VLE_LIBRARY_DIRS} ${GVLE_LIBRARY_DIRS}
   ${GTKSOURCEVIEWMM_LIBRARY_DIRS})

vle.extension.decision/src/vle/gvle/modeling/decision/Decision.cpp

@@ -88,6 +88,57 @@ std::string ActivityModel::toString() const
             % mName % mX % mY % mWidth % mHeight).str();
 }
 
+const Glib::ustring ActivityModel::card(Decision* decision) const
+{
+    Glib::ustring card;
+
+    card = "<b>" + name() + "</b>";
+    card += "\n<b>Rules:</b>";
+
+    std::map < std::string, strings_t >*
+            tmpRules = decision->getRule();
+    int j = getRules().size() - 1;
+    for (int i = 0; i <= j;
+        i++) {
+        card += "\n- " + getRules().at(i);
+
+        int k, l;
+        k = 0;
+        l = tmpRules->operator[]
+                (getRules().at(i)).size() - 1;
+        for (; k <= l; k++) {
+            if (k == 0) {
+                card += ", <b>pred(s).:</b>\n\t- " +
+                        tmpRules->operator[]
+                        (getRules().at(i)).at(k);
+            }
+            else {
+                card += "\n\t- " + tmpRules->operator[]
+                        (getRules().at(i)).at(k);
+            }
+        }
+    }
+
+    if (getRelativeDate()) {
+        card += "\n<b>R. Minstart:</b> " +
+                minstart();
+        card += "\n<b>R. Maxfinish:</b> " +
+                maxfinish();
+    }
+    else {
+        double x = vle::utils::convert < double >
+                (minstart(), true);
+        card += "\n<b>Minstart:</b> " +
+                utils::DateTime::toJulianDayNumber(x);
+        x = vle::utils::convert < double >
+                (maxfinish(), true);
+        card += "\n<b>Maxfinish:</b> " +
+                utils::DateTime::toJulianDayNumber(x);
+    }
+
+    return card;
+}
+
 void Decision::displace(ActivityModel* activityModel, int deltax, int deltay)
 {
     activityModel->displace(deltax, deltay);

vle.extension.decision/src/vle/gvle/modeling/decision/Decision.hpp

@@ -50,6 +50,8 @@ namespace decision {
 typedef std::vector < std::string > strings_t;
 typedef std::map < std::string, std::string > buffers_t;
 
+class Decision;
+
 struct point_t
 {
     int x;
@@ -228,6 +230,18 @@ public :
              oy + (mPoints[0].y - oy) * ratioy;
     }
 
+/**
+ * @brief Return the PrecedenceConstraintModel card : the description displayed in a tooltip
+ * @return the PrecedenceConstraintModel card
+ */
+    const Glib::ustring card()
+    {
+        Glib::ustring card = "Type: " + cType();
+        card += "\n<b>Mintimelag:</b> " + actTlMin();
+        card += "\n<b>Maxtimelag:</b> " + actTlMax();
+        return card;
+    }
+
 private :
     std::string mSource;
     std::string mDestination;
@@ -361,6 +375,13 @@ class ActivityModel
         return mName;
     }
 
+/**
+ * @brief Return the ActivityModel card : the description displayed in a tooltip
+ * @param decision to display rules
+ * @return the ActivityModel card
+ */
+    const Glib::ustring card(Decision* decision) const;
+
 /**
  * @brief Set the name of the ActivityModel
  * @param the new name of the ActivityModel
@@ -735,22 +756,22 @@ class Decision
  * mKnowledgeBase or false if an error occured
  */
 
- bool fillKnowledgeBase(std::string fileName) {
-    if (mActivitiesModel.size() > 0) {
-        std::ifstream fileStream(fileName.c_str(), ios::in);
+    bool fillKnowledgeBase(std::string fileName) {
+        if (mActivitiesModel.size() > 0) {
+            std::ifstream fileStream(fileName.c_str(), ios::in);
 
-        if (fileStream.is_open()) {
-            mKnowledgeBase->plan().fill(fileStream);
-            return true;
+            if (fileStream.is_open()) {
+                mKnowledgeBase->plan().fill(fileStream);
+                return true;
+            }
+            else {
+                return false;
+            }
         }
         else {
-            return false;
+            return true;
         }
     }
-    else {
-        return true;
-    }
-}
 
 /**
  * @brief Return the KnowledgeBase of the class decision.