Merge pull request #82 from adelhpour/fix-some-bugs-add-some-features

fix-some-bugs-add-some-features
adelhpour · Aug 31, 2024 · 2051503 · 2051503
2 parents 2aecec5 + cc9803f
commit 2051503
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 173 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-0.1.2
+0.2.0
diff --git a/src/autolayout/libsbmlnetwork_autolayout.cpp b/src/autolayout/libsbmlnetwork_autolayout.cpp
@@ -1,5 +1,6 @@
 #include "libsbmlnetwork_autolayout.h"
 #include "../libsbmlnetwork_layout_helpers.h"
+#include "../libsbmlnetwork_common.h"
 #include "libsbmlnetwork_fruchterman_reingold_algorithm.h"
 
 #include <cstdlib>
@@ -235,24 +236,24 @@ void updateLayoutDimensions(Layout *layout) {
         double maxX;
         double maxY;
         extractExtents(layout, minX, minY, maxX, maxY);
-        layout->getDimensions()->setWidth(maxX - minX + 2 * padding);
-        layout->getDimensions()->setHeight(maxY - minY + 2 * padding);
+        layout->getDimensions()->setWidth(roundToTwoDecimalPlaces(maxX - minX));
+        layout->getDimensions()->setHeight(roundToTwoDecimalPlaces(maxY - minY));
     }
 }
 
 const bool adjustLayoutDimensions(Layout *layout) {
     std::string width = LIBSBMLNETWORK_CPP_NAMESPACE::getUserData(layout->getDimensions(), "width");
     if (!width.empty()) {
         double presetWidth = std::stod(width);
-        if (std::abs(presetWidth - layout->getDimensions()->width()) < 4 * getDefaultAutoLayoutPadding())
+        if (std::abs(presetWidth - layout->getDimensions()->width()) < 2 * getDefaultAutoLayoutPadding())
             layout->getDimensions()->setWidth(presetWidth);
         else
             return false;
     }
     std::string height = LIBSBMLNETWORK_CPP_NAMESPACE::getUserData(layout->getDimensions(), "height");
     if (!height.empty()) {
         double presetHeight = std::stod(height);
-        if (std::abs(presetHeight - layout->getDimensions()->height()) < 4 * getDefaultAutoLayoutPadding())
+        if (std::abs(presetHeight - layout->getDimensions()->height()) < 2 * getDefaultAutoLayoutPadding())
             layout->getDimensions()->setHeight(presetHeight);
         else
             return false;

diff --git a/src/colors/libsbmlnetwork_colors.cpp b/src/colors/libsbmlnetwork_colors.cpp
@@ -259,7 +259,7 @@ namespace LIBSBMLNETWORK_CPP_NAMESPACE {
     }
 
     const bool isValidHexColorCode(const std::string& value) {
-        if (value.size() != 7 || value.at(0) != '#')
+        if ((value.size() != 7 && value.size() != 9)  || value.at(0) != '#')
             return false;
 
         for (unsigned int i = 1; i < value.size(); i++) {

diff --git a/src/libsbmlnetwork_layout_helpers.cpp b/src/libsbmlnetwork_layout_helpers.cpp
@@ -1258,11 +1258,11 @@ const bool isValidRoleValue(const std::string& role) {
 }
 
 const bool isValidBoundingBoxXValue(const double& x) {
-    return true;
+    return isValidDoubleValue(x);
 }
 
 const bool isValidBoundingBoxYValue(const double& y) {
-    return true;
+    return isValidDoubleValue(y);
 }
 
 const bool isValidBoundingBoxWidthValue(const double& width) {
@@ -1274,45 +1274,53 @@ const bool isValidBoundingBoxHeightValue(const double& height) {
 }
 
 const bool isValidCurveSegmentStartPointXValue(const double& x) {
-    return true;
+    return isValidDoubleValue(x);
 }
 
 const bool isValidCurveSegmentStartPointYValue(const double& y) {
-    return true;
+    return isValidDoubleValue(y);
 }
 
 const bool isValidCurveSegmentEndPointXValue(const double& x) {
-    return true;
+    return isValidDoubleValue(x);
 }
 
 const bool isValidCurveSegmentEndPointYValue(const double& y) {
-    return true;
+    return isValidDoubleValue(y);
 }
 
 const bool isValidCurveSegmentBasePoint1XValue(const double& x) {
-    return true;
+    return isValidDoubleValue(x);
 }
 
 const bool isValidCurveSegmentBasePoint1YValue(const double& y) {
-    return true;
+    return isValidDoubleValue(y);
 }
 
 const bool isValidCurveSegmentBasePoint2XValue(const double& x) {
-    return true;
+    return isValidDoubleValue(x);
 }
 
 const bool isValidCurveSegmentBasePoint2YValue(const double& y) {
-    return true;
+    return isValidDoubleValue(y);
 }
 
 const bool isValidDimensionValue(const double& dimensionValue) {
-    if (dimensionValue > 0.000)
+    if (isValidDoubleValue(dimensionValue) && dimensionValue > 0.000)
         return true;
 
     std::cerr << "error: A dimension value must be greater than 0" << std::endl;
     return false;
 }
 
+const bool isValidDoubleValue(const double& doubleValue) {
+    if (!std::isnan(doubleValue) && !std::isinf(doubleValue))
+        return true;
+
+    std::cerr << "error: A double value must be a valid number" << std::endl;
+    return false;
+}
+
 const bool isValidAlignment(const std::string& alignment) {
     return isValueValid(alignment, getValidAlignmentValues());
 }

diff --git a/src/libsbmlnetwork_layout_helpers.h b/src/libsbmlnetwork_layout_helpers.h
@@ -314,6 +314,8 @@ const bool isValidCurveSegmentBasePoint2YValue(const double& y);
 
 const bool isValidDimensionValue(const double& dimensionValue);
 
+const bool isValidDoubleValue(const double& doubleValue);
+
 const bool isValidAlignment(const std::string& alignment);
 
 const bool isValidDistributionDirection(const std::string& direction);