From 419b248e234499994594e0a2b109eecca3b0d1e1 Mon Sep 17 00:00:00 2001 From: DUC ANH HOANG Date: Thu, 5 Dec 2024 14:58:28 +0100 Subject: [PATCH 1/3] [EDF31321]: Add bootsrap in dependence --- CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47c7d2abc..a06fad1f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,17 @@ ENDIF() SALOME_SETUP_VERSION(9.13.0) MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") +# Find SalomeBootstrap +# =========== +SET(SALOMEBOOTSTRAP_ROOT_DIR $ENV{SALOMEBOOTSTRAP_ROOT_DIR} CACHE PATH "Path to the Salome Bootstrap") +IF(EXISTS ${SALOMEBOOTSTRAP_ROOT_DIR}) + FIND_PACKAGE(SalomeBootstrap REQUIRED) + ADD_DEFINITIONS(${SALOMEBOOTSTRAP_DEFINITIONS}) + INCLUDE_DIRECTORIES(${SALOMEBOOTSTRAP_INCLUDE_DIRS}) +ELSE(EXISTS ${SALOMEBOOTSTRAP_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome Bootstrap, please define SALOMEBOOTSTRAP_ROOT_DIR") +ENDIF(EXISTS ${SALOMEBOOTSTRAP_ROOT_DIR}) + # Find KERNEL # =========== SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") From 3628387a8bbfa28c6f89e3eb4a679d68467f0b9b Mon Sep 17 00:00:00 2001 From: DUC ANH HOANG Date: Fri, 20 Dec 2024 10:34:19 +0100 Subject: [PATCH 2/3] Revert "[EDF31321]: Add bootsrap in dependence" This reverts commit 419b248e234499994594e0a2b109eecca3b0d1e1. --- CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a06fad1f4..47c7d2abc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,17 +41,6 @@ ENDIF() SALOME_SETUP_VERSION(9.13.0) MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") -# Find SalomeBootstrap -# =========== -SET(SALOMEBOOTSTRAP_ROOT_DIR $ENV{SALOMEBOOTSTRAP_ROOT_DIR} CACHE PATH "Path to the Salome Bootstrap") -IF(EXISTS ${SALOMEBOOTSTRAP_ROOT_DIR}) - FIND_PACKAGE(SalomeBootstrap REQUIRED) - ADD_DEFINITIONS(${SALOMEBOOTSTRAP_DEFINITIONS}) - INCLUDE_DIRECTORIES(${SALOMEBOOTSTRAP_INCLUDE_DIRS}) -ELSE(EXISTS ${SALOMEBOOTSTRAP_ROOT_DIR}) - MESSAGE(FATAL_ERROR "We absolutely need a Salome Bootstrap, please define SALOMEBOOTSTRAP_ROOT_DIR") -ENDIF(EXISTS ${SALOMEBOOTSTRAP_ROOT_DIR}) - # Find KERNEL # =========== SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") From 3dada3ac1cf00caeea5abc8eaeb957508dc3058d Mon Sep 17 00:00:00 2001 From: mbs Date: Fri, 3 Jan 2025 12:25:02 +0000 Subject: [PATCH 3/3] [GITHUB][GEOM ISSUE#7] wrong doc for make ellipse --- doc/salome/gui/GEOM/input/creating_ellipse.doc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/salome/gui/GEOM/input/creating_ellipse.doc b/doc/salome/gui/GEOM/input/creating_ellipse.doc index 124e7f384..b912b9b91 100644 --- a/doc/salome/gui/GEOM/input/creating_ellipse.doc +++ b/doc/salome/gui/GEOM/input/creating_ellipse.doc @@ -19,14 +19,10 @@ corresponds to OX axis of the global coordinate system. Vmaj' = (Vn * Vmaj) * Vn, where \em Vn is a normal vector and \em Vmaj is an original vector of the major axis. -\n TUI Command (without the major axis): geompy.MakeEllipse(Point, Vector, RadiusMajor, RadiusMinor) +\n TUI Command (without the major axis): geompy.MakeEllipse(Point, Vector, RadiusMajor, RadiusMinor, VectorMajor=None) \n Arguments: Name + 1 vertex (for the center) + 1 edge (for -the direction) + 1 X Radius + 1 Y Radius. - -\n TUI Command (with the major axis): geompy.MakeEllipseVec(Point, Vector, RadiusMajor, RadiusMinor, VectorMajor) -\n Arguments: Name + 1 vertex (for the center) + 1 edge (for -the normal direction) + 1 X Radius + 1 Y Radius + 1 edge (for the -major axis direction). +the direction) + 1 X Radius + 1 Y Radius + 1 optional edge (for the major axis direction). +\n If the VectorMajor argument is omitted, the ellipse's major axis will be along the X-axis. \image html ellipse.png