From cff6b5fb957a17c8b2a0f1f9b8f41e973cb6c7a9 Mon Sep 17 00:00:00 2001 From: dcq Date: Tue, 18 May 2004 12:21:20 +0000 Subject: [PATCH] DCQ: Kinematic... --- adm_local/unix/make_commence.in | 2 +- idl/GEOM_Gen.idl | 14 +++- idl/GEOM_Kinematic.idl | 111 ++++++++------------------- src/BasicGUI/BasicGUI.cxx | 2 +- src/BasicGUI/BasicGUI_ArcDlg.cxx | 5 +- src/BasicGUI/BasicGUI_CircleDlg.cxx | 5 +- src/BasicGUI/BasicGUI_EllipseDlg.cxx | 5 +- src/BasicGUI/BasicGUI_LineDlg.cxx | 5 +- src/BasicGUI/BasicGUI_PlaneDlg.cxx | 5 +- src/DisplayGUI/DisplayGUI.cxx | 5 +- 10 files changed, 68 insertions(+), 91 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index e2d84afb8..4d758b99f 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -31,7 +31,7 @@ C_DEPEND_FLAG = @C_DEPEND_FLAG@ # C++ CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ +CXXFLAGS = @CXXFLAGS@ -Wparentheses -Wreturn-type -Wmissing-declarations -Winline CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ # JAVA diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 4b2f3c3c9..7019da296 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -196,7 +196,12 @@ module GEOM in DirStruct dstruct, in double major_radius, in double minor_radius) raises (SALOME::SALOME_Exception) ; - + + //-----------------------------------------------------------// + // Sketcher // + //-----------------------------------------------------------// + GEOM_Shape MakeSketcher (in string Cmd) raises (SALOME::SALOME_Exception) ; + //-----------------------------------------------------------// // Primitives Construction // //-----------------------------------------------------------// @@ -346,9 +351,12 @@ module GEOM void SetPosition(in GEOM_Contact Contact) raises (SALOME::SALOME_Exception) ; - void SetRotation(in GEOM_Contact Contact) raises (SALOME::SALOME_Exception) ; + void SetAngularRange(in GEOM_Contact Contact) raises (SALOME::SALOME_Exception) ; + + void SetLinearRange(in GEOM_Contact Contact) raises (SALOME::SALOME_Exception) ; - void SetTranslation(in GEOM_Contact Contact) raises (SALOME::SALOME_Exception) ; + void SetDisplacement(in GEOM_Animation Animation, + in GEOM_Contact Contact) raises (SALOME::SALOME_Exception) ; }; }; diff --git a/idl/GEOM_Kinematic.idl b/idl/GEOM_Kinematic.idl index cf102c26e..9aeede5cd 100644 --- a/idl/GEOM_Kinematic.idl +++ b/idl/GEOM_Kinematic.idl @@ -31,81 +31,57 @@ module GEOM { - interface GEOM_Contact; - typedef sequence ListOfContact; + typedef sequence ListOfDouble; //-----------------------------------------------------------------// - // interface GEOM_Position methods // + // interface GEOM_Contact methods // //-----------------------------------------------------------------// - interface GEOM_Position { + interface GEOM_Contact { - void SetOrigin(in GEOM::PointStruct P0) + long GetType() raises (SALOME::SALOME_Exception); - void SetVX(in GEOM::DirStruct Vect) + GEOM::GEOM_Shape GetShape1() raises (SALOME::SALOME_Exception); - void SetVY(in GEOM::DirStruct Vect) + GEOM::GEOM_Shape GetShape2() raises (SALOME::SALOME_Exception); - void SetVZ(in GEOM::DirStruct Vect) + double GetStep() raises (SALOME::SALOME_Exception); - GEOM::PointStruct GetOrigin() + GEOM::ListOfDouble GetPosition() raises (SALOME::SALOME_Exception); - GEOM::DirStruct GetVX() + GEOM::ListOfDouble GetAngularRange() raises (SALOME::SALOME_Exception); - GEOM::DirStruct GetVY() + GEOM::ListOfDouble GetLinearRange() raises (SALOME::SALOME_Exception); - GEOM::DirStruct GetVZ() + void SetPosition(in double P0x, in double P0y, in double P0z, + in double VXx, in double VXy, in double VXz, + in double VYx, in double VYy, in double VYz, + in double VZx, in double VZy, in double VZz) raises (SALOME::SALOME_Exception); - }; - - //-----------------------------------------------------------------// - // interface GEOM_Rotation methods // - //-----------------------------------------------------------------// - interface GEOM_Rotation { - - void SetRotation(in long Rot1, in long Rot2, in long Rot3, - in double Val1, in double Val2, in double Val3) + void SetAngularRange(in double MinValX, in double MaxValX, + in double MinValY, in double MaxValY, + in double MinValZ, in double MaxValZ) raises (SALOME::SALOME_Exception); - long GetRot1() - raises (SALOME::SALOME_Exception); - long GetRot2() - raises (SALOME::SALOME_Exception); - long GetRot3() + void SetLinearRange(in double MinValX, in double MaxValX, + in double MinValY, in double MaxValY, + in double MinValZ, in double MaxValZ) raises (SALOME::SALOME_Exception); - double GetVal1() - raises (SALOME::SALOME_Exception); - double GetVal2() - raises (SALOME::SALOME_Exception); - double GetVal3() - raises (SALOME::SALOME_Exception); + attribute string Name; + attribute string ShapeId; + attribute string StudyShapeId; }; - //-----------------------------------------------------------------// - // interface GEOM_Translation methods // - //-----------------------------------------------------------------// - interface GEOM_Translation { - - void SetTranslation(in double ValX, in double ValY, in double ValZ) - raises (SALOME::SALOME_Exception); - - double GetValX() - raises (SALOME::SALOME_Exception); - double GetValY() - raises (SALOME::SALOME_Exception); - double GetValZ() - raises (SALOME::SALOME_Exception); - - }; + typedef sequence ListOfContact; //-----------------------------------------------------------------// // interface GEOM_Assembly methods // @@ -127,38 +103,6 @@ module GEOM }; - //-----------------------------------------------------------------// - // interface GEOM_Contact methods // - //-----------------------------------------------------------------// - interface GEOM_Contact { - - long GetType() - raises (SALOME::SALOME_Exception); - - GEOM::GEOM_Shape GetShape1() - raises (SALOME::SALOME_Exception); - - GEOM::GEOM_Shape GetShape2() - raises (SALOME::SALOME_Exception); - - double GetStep() - raises (SALOME::SALOME_Exception); - - GEOM::GEOM_Position GetPosition() - raises (SALOME::SALOME_Exception); - - GEOM::GEOM_Rotation GetRotation() - raises (SALOME::SALOME_Exception); - - GEOM::GEOM_Translation GetTranslation() - raises (SALOME::SALOME_Exception); - - attribute string Name; - attribute string ShapeId; - attribute string StudyShapeId; - - }; - //-----------------------------------------------------------------// // interface GEOM_Animation methods // //-----------------------------------------------------------------// @@ -176,6 +120,13 @@ module GEOM long GetNbSeq() raises (SALOME::SALOME_Exception); + GEOM::ListOfDouble GetDisplacement(in GEOM_Contact aContact) + raises (SALOME::SALOME_Exception); + + void SetDisplacement(in GEOM_Contact aContact, + in GEOM::ListOfDouble aList) + raises (SALOME::SALOME_Exception); + attribute string Name; attribute string ShapeId; attribute string StudyShapeId; diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index 54e4116cb..aef6d70b0 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -201,7 +201,7 @@ gp_Pnt BasicGUI::ConvertClickToPoint(Standard_Real x, Standard_Real y, Handle(V3 gp_Pln PlaneOfTheView = gp_Pln(AtPoint,EyeDir); Standard_Real X, Y, Z; - aView->Convert(x, y, X, Y, Z); + aView->Convert(int(x), int(y), X, Y, Z); gp_Pnt ConvertedPoint(X, Y, Z); gp_Pnt2d ConvertedPointOnPlane = ProjLib::Project(PlaneOfTheView, ConvertedPoint); diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index 751a6e686..4c3bfaa9c 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_ArcDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_ArcDlg() // purpose : Constructs a BasicGUI_ArcDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx index 14b866419..a10e4049f 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.cxx +++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_CircleDlg.h" #include @@ -35,6 +34,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_CircleDlg() // purpose : Constructs a BasicGUI_CircleDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx index e7ea7199f..80321b426 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx +++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx @@ -25,7 +25,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_EllipseDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_EllipseDlg() // purpose : Constructs a BasicGUI_EllipseDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index fe9f75b50..a146f4d8e 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_LineDlg.h" #include @@ -34,6 +33,10 @@ using namespace std; #include #include +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_LineDlg() // purpose : Constructs a BasicGUI_LineDlg which is a child of 'parent', with the diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index b280bfeae..6b3a77f8f 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header$ -using namespace std; #include "BasicGUI_PlaneDlg.h" #include @@ -37,6 +36,10 @@ using namespace std; #include #include "QAD_Config.h" +#include "utilities.h" + +using namespace std; + //================================================================================= // class : BasicGUI_PlaneDlg() // purpose : Constructs a BasicGUI_PlaneDlg which is a child of 'parent', with the diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index 45dc97b16..0ef6fcdfe 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -26,7 +26,6 @@ // Module : GEOM // $Header: -using namespace std; #include "DisplayGUI.h" #include "QAD_RightFrame.h" @@ -39,6 +38,10 @@ using namespace std; #include +#include "utilities.h" + +using namespace std; + //======================================================================= // function : DisplayGUI() // purpose : Constructor -- 2.39.2