1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00

Compare commits

..

153 Commits

Author SHA1 Message Date
abv
f9823ea65a 0024884: expand the list of short compiler names in CMake meta-project
List of compiler short names expanded (added: gcc, gxx, mingw, clang, intel); generation of install folder name is corrected to include compiler name without spaces even if short name is not recognized.

Tcl search was fixed (tcl8.6 has higher priority than tcl or tcl8.5);
Search for fb2build.h of freetype 2.5.1 was corrected

THRDPARTY_PATH is included into LD_LIBRARY_PATH
2014-04-30 12:18:33 +04:00
abv
389eb5c910 OCCT_VERSION_DEVELOPMENT commented for release of 6.7.1 2014-04-29 10:36:27 +04:00
abv
7e20706934 0024707: Problem building C# sample win VC 10
Need to check and correct Target Framework in C# projects after conversion to new versions of Visual Studio described in the sample documentation
2014-04-29 10:36:26 +04:00
apn
d76a15bc94 0024347: problem by tolerance of the distance of Face and Vertex
Added test case bugs/modalg_5/bug24347
2014-04-29 10:36:25 +04:00
apn
6a879fe2ee 0024811: Intersection is insufficient
Added test case bugs/modalg_5/bug24811
2014-04-29 10:36:24 +04:00
apn
d2453d6d74 0024496: Crash on BRepAlgoAPI_Section
Added test case bugs/modalg_5/bug24496
2014-04-29 10:36:23 +04:00
ibs
7f5b235f54 0024629: Possibility to install binaries in vc*/bin(d), vc*/lib(d) directories
Install occt folder now can contain several occt configurations

- custom.bat/sh was added to include specific (for each occt config) custom.bat/sh files
- specific custom.bat/sh is added for each configuration (e.g., custom_vc9_win32_d.bat), generated by cmake and included within custom.bat/sh
- draw.bat has three argument, e.g., vc9 win32 debug (as occt behavior)
- sample.bat has one or four arguments, e.g., sample_name vc8 win64 release
- PATH is not changed. DRAWEXE.exe is called from specific folder

patched custom.[bat/sh].[main/in] files have higher priority than origin ones

Documentation was updated to describe new features of CMake

Seeking process of OpenCL include folder was fixed
2014-04-29 10:22:15 +04:00
ibs
85f7319cd3 0024810: "Patch" feature should be introduced in OCC CMake building procedure
BUILD_PATCH_DIR variable added
patched source/project files have higher priority to be included than origin source files
2014-04-29 09:35:53 +04:00
abv
3307951d21 0024877: GCC 4.4.5 compiler warnings on Debian when OCCT is bult using CMake
Warnings fixed
2014-04-29 09:35:52 +04:00
dbp
38391c10a3 0024878: Ray-tracing mode does not work in IE Sample 2014-04-28 19:10:18 +04:00
duv
aa125c5ae6 0024867: Visualization - polygon offsets look broken
If specific layer setting is not enabled, default value extracted from current OpenGl state will be used.
2014-04-24 16:55:47 +04:00
mkv
c34795d6ff 0024376: BMP image cannot be read
Test case for issues CR24376
2014-04-23 15:58:06 +04:00
vro
e58306b1b7 0024852: Crash on storage of an Ocaf document in XML file format
Blanks are removed.
A check is implemented to correct a GUID in case of presence of the blanks.

Test case for issues CR24852
2014-04-23 15:57:42 +04:00
jgv
1d1a589b2f 0024842: Crash on change of HLR-algo in top and bottom views of customer's shape
Test cases for issues CR24842
2014-04-23 15:55:27 +04:00
pkv
7e35263b76 0024861: Extra solid is in the result of General Fuse Operation
I. New features:
No new features.

II. Changes:
II.1. class BOPAlgo_ShellSplitter
   - statc function:
void RefineShell(TopoDS_Shell& theShell);
has been addded.
The function provides splitting connexity block of faces when the block begins with
the face that is intended to be internal.

II.2. class BOPAlgo_ShellSplitter
   - statc function:
Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell);
has been modified to process empty shells.

II.3. class BOPAlgo_ShellSplitter
   - method:
void BOPAlgo_ShellSplitter::SplitBlock(BOPTools_ConnexityBlock& aCB);
has been modified to process connexity blocks of faces when the block
begins with the face that is intended to be internal [ II.1 ].

III. Modified entities:
packages:
BOPAlgo

Test case for issue CR24861
2014-04-23 15:54:30 +04:00
ski
cfa972bac6 0024857: CLang warnings -Wunused-function
Unused functions were removed.
2014-04-23 15:52:49 +04:00
emv
40f8a31d70 0024798: Boolean operation CUT produces incorrect result
Face classifier has been used to check adjustment of 2d curve for the face.

Test case for issue CR24798
2014-04-23 15:52:22 +04:00
ski
94e9ce82b8 0024853: CLang warnings -Wunused-const-variable
Unused variables were removed.
2014-04-23 15:50:21 +04:00
jgv
2357f3393d 0024840: Exception in BRepOffsetAPI_MakePipe
Test cases for issues CR24840 and CR24849
2014-04-23 15:48:20 +04:00
ski
2d596a1a97 0024845: CLang warnings -Wunused-variable
Unused variables were removed.
2014-04-23 15:46:08 +04:00
gka
4c04024c75 0024800: Point of intersection was not found for 2d offset curve.
For fix this case in method Geom2dInt_Geom2dCurveTool::NBSamples() number of samples for 2d offset and trimmed curve is computed as max value from number of samples for other curve and number of samples for basis curve.

Test case for issue CR24800
2014-04-23 15:45:38 +04:00
mkv
2bb3ffc5af Test cases for issue CR24827 2014-04-23 15:43:48 +04:00
ski
5b4ffe5f20 0024856: CLang warnings -Wunused-private-field
Actual warnings were fixed.
2014-04-22 11:26:47 +04:00
ski
9e850c7d4f 0024843: CLang warnings -Wconstant-logical-operand
Logical expression is corrected to take into account input argument
2014-04-21 19:17:20 +04:00
emv
b99e1b768f 0024823: Hang up in "bopcheck" command
Modifications:
class IntTools_EdgeEdge
 1. method
   Standard_Boolean IntTools_EdgeEdge::FindParameters(
      const BRepAdaptor_Curve& theB
      const Standard_Real aT1,
      const Standard_Real aT2,
      const Standard_Real theRes,
      const Standard_Real thePTol,
      const Bnd_Box& theCBox,
      Standard_Real& aTB1,
      Standard_Real& aTB2)

   Added protection for large values of parameters of the edges.

 2. methods
    static Standard_Boolean BndCommon(const Bnd_Box& theB1,
                                      const Bnd_Box& theB2,
                                      Bnd_Box& theBOut)
   and
    IntTools_EdgeEdge::FindSolutions()

   have been removed as redundant.

Test case for issue CR24823
2014-04-21 19:15:11 +04:00
emv
45671182ca 0024844: Wrong result of Boolean Cut operation.
Small correction in intersection between Cone and Torus with collinear axes.

Test case for issue CR24844
2014-04-21 19:03:31 +04:00
jgv
08fb0007c1 0024793: Documentation of methods using BRepFill_TypeOfContact has to be updated according to changes introduced in OCCT 6.7.0 2014-04-21 18:58:08 +04:00
azn
afbc9b8d07 0024775: False detecting of intersection in BRepMesh_Classifier class.
Increased checking accuracy of endpoints touching of segments.
Code formatting improvement.
Test case for issue CR24775
Correction test case for issue CR24775
2014-04-21 18:55:48 +04:00
ski
c89d3fc40e 0024846: CLang warnings -Wunneeded-internal-declaration
Unused function was removed.
2014-04-21 13:31:16 +04:00
emv
239a64e7c2 0024820: CLang compiler warning -Wreturn-stack-address
The signature of the function BOPDS_DS::CommonBlock(const Handle(BOPDS_PaveBlock)& thePB)
has been changed to return handle, not a reference to handle.
2014-04-21 13:30:36 +04:00
ski
5cfb55b03b 0024818: CLang warnings -Wlogical-not-parentheses
CLang warnings -Wlogical-not-parentheses were fixed.
2014-04-21 13:26:47 +04:00
kgv
7ff50764f6 0024821: CLang warning -Wunsequenced in StdSelect_ViewerSelector3d 2014-04-21 11:40:57 +04:00
ski
1ef1d19430 0024848: CLang warnings -Wunused-value
Warning should be fixed.
2014-04-21 11:40:22 +04:00
vro
a226710223 0024822: Solve selection fails after copying
The method ::Paste() copies myIndex now.
Test case for issue CR24822
2014-04-21 11:38:23 +04:00
pkv
6b533a89c6 0024851: Extra vertex is in the result of Boolean Fuse Operation
class IntTools_FaceFace
   - statc function:
void CorrectSurfaceBoundaries(const TopoDS_Face&  theFace,
                              const Standard_Real theTolerance,
                              Standard_Real&      theumin,
                              Standard_Real&      theumax,
                              Standard_Real&      thevmin,
                              Standard_Real&      thevmax)
The faces based on cylidrical surface has been added to the list of candidates to extend the boundaries

Test case for issue CR24851
2014-04-21 11:30:43 +04:00
ysn
219991ccfa 0024578: Typos in Developer Guide "Building OCCT from sources"
Dev guides for building 3rd party products and "short guide" to WOK have been reviewed.
2014-04-21 11:28:41 +04:00
ysn
2103edf66e 0024602: Documentation Code Snippets missing sign
Fix for bug 24602 about missing <, >, " and some other signs.
Also a major review of documetation to fix wrong formatting issues.
2014-04-21 11:28:39 +04:00
agv
1675f2097f 0024812: Provide VS2012 debugger visualizer for OCCT types 2014-04-21 07:23:50 +04:00
emv
f76b85c4db 0024809: Exception is raised during perform of "bfillds" command on attached shape
On attached shape command "bfillds -s" hangs in Test Harness on the long time. In debug mode exception is raised.
Vectors are normalized before calculation of an angle.
Added test case bugs/modalg_5/bug24809
2014-04-21 07:22:52 +04:00
abv
2f53312e38 0024625: Upgrade Bison to version 2.2 or above
Eliminate MSVC warnings in code generated by Bison 2.41 on Linux
2014-04-10 15:15:43 +04:00
kgv
3d35746b53 0024736: There is new additional compilation warning on Linux platform 2014-04-10 15:15:42 +04:00
apn
56a979d205 Update testing cases for current state of OCCT6.7.1 2014-04-10 15:10:00 +04:00
abv
dd81d91035 OCC_VERSION_DEVELOPMENT changed to "beta" 2014-04-10 15:09:59 +04:00
dbv
e79807c77f 0024759: Crash on STEP import, when reading a file exported in non-"C" locale
Fix for step reading: protection against memory buffer overrun when parsing list of reals written with comma as radix
2014-04-09 17:09:59 +04:00
abv
fc8a8f4cb1 Fix for building lex scanners on Windows when scanner is generated by flex 2.5.35 on Linux 2014-04-09 17:09:58 +04:00
omy
a2d4105f48 0024722: Move functionality of WOK command wgendoc to OCCT tool gendoc
Command gendoc improved to:
- generate Reference Manual documentation (OCCT classes reference) with option -refman; option -overview can be used for generation of overview documentation;
- generate PDF documents for all User Guides automatically (for files listed in FILES_PDF.txt);
- check availability of third-party tools (Doxygen, Inkscape etc.) and properly report warnings and errors.
- use templates of configuration files for third-party tools instead of their generation. These template files are located in dox/resources folder

Tcl scripts are moved from dox folder to adm.
Doxygen warnings are eliminated.
Moved all auxilary functions to occaux.tcl.
2014-04-09 17:09:57 +04:00
ifv
93c85fddfd 0024766: Wrong result for distmini between a TopoDS_Shell and a TopoDS_Edge on version 6.6.0. 2014-04-09 16:45:40 +04:00
emv
16e15f4ecc 0024656: Exception on current version of OCC libraries during perform of boolean operation (Regression)
Added protection for null vector.
Test case for issue CR24656
2014-04-09 16:38:35 +04:00
emv
d94d85fabc 0024770: On attached shape command "bfillds -s" hangs in Test Harness on the long time. In debug mode exception is raised.
Vectors are normalized before calculation of an angle.
2014-04-09 16:36:18 +04:00
duv
3db496cbf6 0024785: Visualization - Modifying z-layers concept to gain more control over OpenGl depth buffer. 2014-04-09 09:52:19 +04:00
abv
85146fa841 Fix compilation problem on Linux 2014-04-08 16:36:05 +04:00
mkv
2bbf4c9f0f 0023972: Exception thrown when intersecting two cones
DRAW command and test case for issue CR23972
2014-04-04 17:25:15 +04:00
apl
ec023ced13 0024747: TKOpenGl - Mesa fails to destroy context if it set to current thread 2014-04-04 16:11:20 +04:00
apl
526bd43010 0024725: AIS_TexturedShape - flag switching texture modulation mode does not work
Missing code restored
2014-04-04 13:41:39 +04:00
abv
049d51911f New compiler warnings (vc10 64-bit) fixed in BOPCol_TBB.hxx 2014-04-04 11:22:58 +04:00
kgv
6858f70e9a 0024762: Visualization - new interactive object AIS_ColoredShape with customized subshapes presentations
AIS_Shape, ::SetColor(), ::SetMaterial(), ::SetTransparency(), ::SetWidth() - improve consistency.
Setup color for marker aspect as well.

vaspects - new command superseeds vsetcolor, vsetmaterial, vsettransparancy, vsetwidth and their unset analogs. Improve syntax and arguments validation.

OpenGl_AspectMarker::SetAspect() - do not reset myMarkerSize when sprite is unchanged.

Extend NCollection_IndexedDataMap - Iterator::Key() and FindFromKey() with value copying.

Add test case bugs vis bug24762_coloredshape.
2014-04-04 11:22:57 +04:00
jgv
a76ea94c2c 0023892: Missing intersection edge between two faces.
Test case for issue CR23892
2014-04-04 09:02:40 +04:00
pkv
b6b92d2007 0024639: Parallelization FillDS part of BO
The contents dealing with the parallel computation of Vertex/Face interferences.
2014-04-04 08:57:15 +04:00
jgv
0b8da30b81 0024767: Crash on making edges in HLRBRep 2014-04-04 08:57:04 +04:00
kgv
a9d8087f1d 0024754: Remove constructor for static class TopOpeBRep_PointGeomTool 2014-04-04 08:56:52 +04:00
pkv
cfdd99315c 0024764: Alien subshapes occured in result of 'bopcheck' operation
class BOPAlgo_ArgumentAnalyzer
   - method:
void BOPAlgo_ArgumentAnalyzer::TestSelfInterferences()
The new shapes has been excluded from the treatment

void BOPAlgo_CheckerSI::PostTreat()
The new shapes has been excluded from the treatment

Standard_Integer bopcheck
  (Draw_Interpretor& di, Standard_Integer n,  const char** a )
The new shapes has been excluded from the treatment.
The interferences of the type */Solid has been included in the treatment.

Test case for issue CR24764
2014-04-04 08:56:38 +04:00
szy
d347054cd0 0024535: Bad type cast in TDocStd_Document::Update()
Eliminating of GCC compiler warning on breakage of C pointer aliasing rules.
2014-04-04 08:53:46 +04:00
emv
e02a6a7242 0024751: Performance improvements in the Edge/Edge intersection algorithm
Added new static method PointBoxDistance() to compute distance between point and bounding box.
Removed method IntTools_EdgeEdge::FindRoughRanges().
Test cases for issue CR24751
2014-04-04 08:53:45 +04:00
jgv
f74388470f 0024738: BRepOffsetAPI_MakePipe algorithm fails on circular path and section (the case where result is part of sphere)
Test case for issue CR24738
2014-04-04 08:53:44 +04:00
nbv
18b15698f2 0024684: Command fixshape hangs up on the attached shape
Algorithm of seeking of any internal point into given face is corrected.
Test case for issue CR24684
2014-04-04 08:53:43 +04:00
jgv
a4f8324b73 0024633: Incorrect projection of a curve on a surface
Test cases for issue CR24633
2014-04-04 08:53:42 +04:00
szy
0d3bd50c5f 0024565: MgtBRep persistence bug
Fix of the persistence bug (exception with message "Persistant CurveRep is Null").
Creating new draw command for testing CR24565
Revert license header corruption
Correction for new draw command OCC24565
Test case for issue CR24565
2014-04-04 08:53:41 +04:00
pkv
300db797f6 0024639: Parallelization FillDS part of BO
Modifications to avoid compilation errors
2014-04-04 08:53:40 +04:00
kgv
0a2ea55506 0024745: Needless inheritance of OSD_MemInfo from Standard_Transient 2014-04-04 08:53:39 +04:00
apn
4f93d2bea6 Update testing case for issue 0024499
Added XSDRAW instead of XDE
2014-03-26 09:20:15 +04:00
abv
93c87d6d1d Fix compiler issues after extracting commits for OCCT 6.7.1 2014-03-25 19:12:59 +04:00
ibs
012f20ac52 0024549: Faulty shape after IGES translation with xstep.cascade.unit set to M
pcurve as line isn't created to avoid incorrect parameterization
Test case for issue CR24549

Test cases were corrected according to their new behavior
2014-03-25 17:01:47 +04:00
emv
95b76cb166 0024706: Solids produced by BOP do not have flag Closed set in shells
Flag CLOSED is set for closed shells created during perform of Boolean Operation.
Test cases for issue CR24706
2014-03-25 17:01:45 +04:00
kgv
e5bf25d8cc 0024730: remove constructor for class TopOpeBRep_PointGeomTool 2014-03-25 17:01:44 +04:00
pkv
d2d376f20f 0024733: Subshape IDs change between two executions of a same script
Changes:
1. class BOPTools_Set
   - method:
void BOPTools_Set::AddEdges(const TopoDS_Shape& aS)
has been removed as redundant

2. class BOPTools_Set
   - method:
Standard_Boolean BOPTools_Set::IsEqual  (const BOPTools_Set& theOther)const
has been modified to take into account Locations of the shapes

3. class BOPAlgo_Builder
   - method:
void BOPAlgo_Builder::FillSameDomainFaces()
has been modified in accordance with the modifications done in II.1.
2014-03-25 17:00:54 +04:00
aba
b0e6ae72af 0024668: Null flyout value case in AIS_Dimension::SetTextPosition() method is not considered.
Corrected checks of working plane and dimension geometry.

Corrected remarks: IsComputed flag was added to the SelectionGeometry to check if it is filled; AdjustParameters() methods became const ones.

minor remark
2014-03-25 17:00:53 +04:00
mkv
c69d58d816 0024493: Partition algorithm produces not valid shape(splt of 10 faces)
Test cases for issue CR24493
2014-03-25 17:00:52 +04:00
emv
ce544c1225 0024696: Lower performance of the new Edge/Edge intersection algorithm
Performance improvements in IntTools_EdgeEdge algorithm:
1. Added check for common box between edges: if common box between edges is thin,
   find exact solutions at once, without looking for rough ranges first;
2. Improved methods IntTools_EdgeEdge::FindBestSolution() and
   IntTools_EdgeEdge::CheckCoincidence(...) by using method SplitRangeOnSegments
   with resolution of the curve as a criteria for size of the ranges.

Test cases for issue CR24696
2014-03-25 17:00:51 +04:00
bugmaster
00a4cf6aac Update cpulimit due to issue 24596 2014-03-25 16:58:24 +04:00
ama
e8089c16bb 0024596: Slow import of IGES data
Part 1: Speed up of import functionality.
Correction in ShapeFix_IntersectionTool::FixIntersectingWires() - preliminary construction of ShapeAnalysis_Surface tool for the whole face; computation of 2d bounding boxes for edges and wires before intersection checking.

Part 2: Speed up of check shape.
Correction in BRepCheck_Face::IntersectWires() in the same way: preliminary computation of 2d boxes for edges and wires in order to reduce the number of calls of intersection tool for pair of wires.

Test cases for issue CR24596
2014-03-25 16:58:23 +04:00
skv
8697074c63 0024667: BRepOffsetAPI_MakePipe::FirstShape() and LastShape() return shapes not from result
Test case for issue CR24667
2014-03-25 16:55:58 +04:00
kgv
1ca028d4d9 0024701: TKernel - drop redundant headers Standard_ctype.hxx and Standard_inverse.h 2014-03-25 16:54:27 +04:00
abv
504a34098f 0024431: Using svg-images in the documentation
Documentation generator improved to automatically convert SVG images to PDF when PDF documents are generated. This is done with Inkscape thus it becomes necessary for generation of PDF documents.

Doxygen alias "figure" added for easy insertion of images with single command for both HTML and PDF output.

Documentation is updated.

Reviewed documentation.md and added more recommendations on Document Syntax.
Introduced existing svg images in the documentation.

Description of formatting of plain text, code blocks, and references revised.
Snapshot of structure of dox folder is updated.
Copyright year is corrected in PDF documents to be always the current one.

Some grammar corrections.
2014-03-25 16:54:26 +04:00
kgv
7eba451d47 0024719: Snapshots for bugs/vis/bug6145 are unstable
Use "new" Boolean operation instead of "old" one.
2014-03-25 16:54:25 +04:00
kgv
4ca09d0f2c 0024685: Coding Rules - "Draw:Atoi" misprints in the document 2014-03-25 16:53:46 +04:00
ifv
76b95c9043 0024650: Wrong intersection curves obtained for a surface of revolution and a plane.
Test case for issue CR24650
2014-03-25 16:53:16 +04:00
ibs
993d79cbbe 0024679: test command doesn't work with tmp path containing white spaces 2014-03-25 16:53:15 +04:00
pkv
924f9d6515 0024639: Parallelization FillDS part of BO
Edge/Edge Interferences

Changes:
1. class BOPAlgo_PaveFiller
  - method:
void BOPAlgo_PaveFiller::PerformEE()
the chages provides the parallel computations of
Edge/Edge interferences.

   - auxiliary classes:
    BOPAlgo_EdgeEdge
    BOPAlgo_EdgeEdgeFunctor
    BOPAlgo_EdgeEdgeCnt
have been added.
The classes are auxiliary classes to provide the parallel computations
of Edge/Edge interferences.

2. class BOPTest
-method:
void BOPTest::PartitionCommands(Draw_Interpretor& theCommands)
- static function:
Standard_Integer bfillds(Draw_Interpretor& di,
                         Standard_Integer n,
                         const char** a)
The syntax of the command "bfillds" has been changed.
> bfillds [-s -t]
options:
-s - launch the algorithm in sequential mode
-t - display CPU time

Test case for issue CR24639
2014-03-25 16:53:14 +04:00
emv
a42c17966f 0024628: Intersection result is unfixed
The map for collecting pave blocks of two faces has been replaced with indexed map
to ensure the constant order of pave blocks when checking section curves for existents.

Test case for issue CR24628
2014-03-25 16:53:13 +04:00
nbv
db71978148 0024612: Wrong pcurve of the section curve
Main changes are in "IntWalk_IWalking::TestDeflection(...)" function (IntWalk_IWalking_5.gxx).

Some test cases were corrected according to their new behavior.
2014-03-25 16:53:12 +04:00
emv
04270abac2 0024673: Test cases for the new Edge/Edge intersection algorithm
New test cases for 0024673
Corrected names of shapes in test cases bugs/modalg_5/bug24208_1 - bug24208_14.
2014-03-25 16:53:11 +04:00
vro
d7de5d6ee1 0024675: Crash reading a VRML file
A node index for a normal is passed through a map of corrected references to node indices.

Test case for issue CR24675
2014-03-25 16:53:10 +04:00
apl
066358578e 0024622: Add method to AIS_TexturedShape class to assign texture data directly from byte stream
Added methods to specify Image_PixMap as texture source to AIS_TexturedShape and Graphic3d_TextureRoot.
Modified internal class MeshVS_ImageTexture2D, originally used for the purpose of sourcing texture as Image_PixMap.

AIS_TexturedShape class:
- Get rid from cdl declaration.
- Remove unused and uninitialized field myDeflection / method Deflection().
- Improve class documentation.
- Use Graphic3d_NOT_2D_UNKNOWN instead of -1.
- Use myIsCustomOrigin and myToScale flags to use/ignore custom values.
2014-03-25 16:51:29 +04:00
vro
34859f0536 0024645: Pointer to the last is wrong for a tree node
- An extra call to DownCast() is removed for a performance reason.
- Information on last child is added to the Dump() method + fixed a problem of lost last child tree node on removal (detach) operation.
- Test case for issue CR24645
2014-03-25 16:50:23 +04:00
osa
3fe0074677 0024671: TKOpenGl, OpenGl_Context - glGetPointerv might be called without GL context 2014-03-25 16:50:22 +04:00
pkv
0f293ebab3 0024654: Result of Boolean operation is invalid for bopargcheck if rotated
class  BndLib
   - method:
void BndLib::Add(const gp_Hypr& H,
                 const Standard_Real P1,
                 const Standard_Real P2,
                 const Standard_Real Tol,
                 Bnd_Box& B)
  - static function:
Standard_Integer ComputeBox(const gp_Hypr& aHypr,
                            const Standard_Real aT1,
                            const Standard_Real aT2,
                            Bnd_Box& aBox)
The function computes bounding box for bounded hyperbola

Test case for issue CR24654
2014-03-25 16:48:38 +04:00
vro
72614a26ba 0024666: Removal of output information in debug mode in Ocaf
DEB_BUILDER replaces DEB pre-processor directive to eliminate extra output on setting a shape to a label.
Small correction of test case
2014-03-25 16:43:23 +04:00
nbv
5945660865 0024575: Exception is raised during 'checkshape' operation.
Recursion calling of "Propagate(...)" function is replaced with cycle.
Test case for issue CR24575
2014-03-25 16:43:22 +04:00
vro
f5ec817829 0024645: Pointer to the last is wrong for a tree node
Information on last child is added to the Dump() method + fixed a problem of lost last child tree node on removal (detach) operation.
Test case for issue CR24645
2014-03-25 16:43:21 +04:00
kgv
b9a802b697 0024636: Coding Rules - define rules for development of Draw Harness commands
.md file corrected grammar, style and logic. Removed redundancies.
2014-03-25 16:43:20 +04:00
ibs
b53def1cab 0024659: misprints in draw documentation 2014-03-25 16:43:19 +04:00
ibs
9020648193 0024364: Document system should use local MathJax also
the new ability choosing of the location of MathJax was introduced
new argument was added to gendoc.bat script
MathJax choice was updated for CHM articles
Minor corrections of documentation
2014-03-25 16:43:18 +04:00
abv
cfcc589a8e 0024599: Tools for interacting with DRAW from Visual Studio debugger
Global functions are added to allow a user performing DRAW commands from VS Command Window when DRAW is interrupted on a breakpoint.
Previously existing functions are adapted to work with Visual Studio debugger (Command Window).
A manual describing use of these functions and other debugging facilities and some hints is added to Developer Guides.
Minor corrections and refinement of debug.md.
2014-03-25 16:43:17 +04:00
pkv
71d986b3bd 0024655: Boolean common produces incorrect result
class BOPAlgo_WireSplitter
   - method:
void BOPAlgo_WireSplitter::SplitBlock
                 (const TopoDS_Face& myFace,
                   BOPTools_ConnexityBlock& aCB);

 - static functions:
void RefineAngles(const TopoDS_Face& myFace,
                  const BOPCol_ListOfShape& myEdges,
                  BOPAlgo_IndexedDataMapOfShapeListOfEdgeInfo& mySmartMap);

void RefineAngles(const TopoDS_Vertex& aV,
                  const TopoDS_Face& myFace,
                  const BOPCol_MapOfShape& aMBE,
                  BOPAlgo_ListOfEdgeInfo& aLEI);

Standard_Boolean RefineAngle2D(const TopoDS_Vertex& aV,
                               const TopoDS_Edge& aE,
                               const TopoDS_Face& myFace,
                               const Standard_Real aA1,
                               const Standard_Real aA2,
                               Standard_Real& aA);

The treatment p-curves convergent in node.
The refining the angles of p-curves taking into account
bounging curves if exist.

Test case for issue CR24655
2014-03-25 16:43:16 +04:00
apn
5df5adf23b Deleted TODO which is not reproduced in Debug mode. 2014-03-25 16:40:55 +04:00
emv
16ab9a2a05 0024648: Different types of intersection curves between Cone and Torus with a different order of arguments
Correct treatment of the cases with Cone and Torus.
Test cases for issue CR24648
2014-03-25 16:40:54 +04:00
pkv
27eaa70718 0024620: BOPAlgo_CheckerSI returns interferences that are not sub-shapes of the source shape
void BOPAlgo_CheckerSI::PrepareCopy()
has been added.
Purpose:
   - provides the copy of the argument
   - provides links between the copy and the original
- protected method:
void BOPAlgo_CheckerSI::PostTreatCopy()
has been added.
Purpose: provides post treat actions wit the copy.

void BOPAlgo_PaveFiller::Perform()
The try/catch mechanism is used inside the method

Standard_Integer bopcheck
  (Draw_Interpretor& di, Standard_Integer n,  const char** a )
The redundant copying is removed.

Standard_Integer bopargcheck
  (Draw_Interpretor& di, Standard_Integer n,  const char** a )
The redundant copying is removed.

packages:
BOPAlgo
BOPTest

Test cases for issue CR24620
Small correction of text case for issue CR24620
2014-03-25 16:40:53 +04:00
ifv
e58a5bee91 0024627: Extrema 2d between an arc of circle and an ellipse crashes
Test case for issue CR24627
2014-03-25 16:40:52 +04:00
pkv
9df27a0ff6 0024618: Embedding vertex in BOP depends on the order of arguments
Changes: class BOPDS_DS
   - method:
void BOPDS_DS::AloneVertices(const Standard_Integer theI,
                             BOPCol_ListOfInteger& theLI)const
The condition for DS-index of a vertex has been corrected

class BOPTools_AlgoTools3D
   - static function:
Standard_Boolean HasGeometry(const TopoDS_Shape& aS)
The returnig value  has been corrected for shapes of vertex type

Modified entities:
packages:
BOPDS
BOPTools

Test cases for issue CR24618
2014-03-25 16:40:51 +04:00
abv
015bb6553d 0024635: Eliminate trivial compiler warnings by GCC in Debug mode 2014-03-25 16:40:50 +04:00
osa
fddb655a7f 0024642: TKOpenGl, OpenGl_Text - rotation angle is ignored in case of 2D text 2014-03-25 16:40:49 +04:00
osa
2c73745603 0024641: TKOpenGl - public methods of OpenGl_Text and OpenGl_AspectText classes are not exported 2014-03-25 16:40:48 +04:00
abv
95432f985e 0024640: Broken logic of check of variable for zero in IntCurvesFace_Intersector constructor
The check is fixed to avoid FPE division by zero
2014-03-25 16:39:51 +04:00
emv
c4ffe7690d 0024558: Boolean operation can not create all results solids which should be built.
Corrections in checking 2d distances when splitting wires.
Test case for the issue.
2014-03-25 16:39:50 +04:00
abv
ed4415982c 0024624: Lost word in license statement in source files
License statement text corrected; compiler warnings caused by Bison 2.41 disabled for MSVC; a few other compiler warnings on 54-bit Windows eliminated by appropriate type cast
Wrong license statements corrected in several files.
Copyright and license statements added in XSD and GLSL files.
Copyright year updated in some files.
Obsolete documentation files removed from DrawResources.
2014-03-25 16:38:55 +04:00
aml
f0fed1712f 0024530: TKMesh - remove unused package IntPoly
Deletion of package IntPoly.
2014-03-25 16:25:33 +04:00
nbv
6eaa828401 0024585: Wrong pcurve of the section curve
PCurve is extended to surface boundary forcefully.
It is made by finding some additional points (if it is possibly).
"bopcurves" DRAW-command returns number of found 3D-curves and (as an option) 2D-curve (see help for more detail information).

Test cases for issue CR24585
2014-03-25 16:24:48 +04:00
aba
ac29779aa9 0024358: TKV3d - connected structures are not re-computed on device lost
Graphic3d_StructureManager::ReComputeStructures() method was corrected to consider all child (connected) structures.
Corrected remarks: added image dump in test case; corrected method name.
2014-03-25 16:23:51 +04:00
apn
58343d7cef 0024499: fixshape produces inverted solid
Bug is not reproduced in current master IR-2014-02-06.
Test bugs/modalg_5/bug24499 was added.
2014-03-25 16:22:47 +04:00
jgv
69e3c5419b 0024586: Pipe construction is failed
Test case for issue CR24586
2014-03-25 16:22:46 +04:00
aba
9647312462 0024412: TKV3d, Dimensions - Possibility to customize text position was lost:
AIS_Dimension::GetTextPosition() and AIS_Dimension::SetTextPosition() methods were added.
Added possibility to set and unset text label alignment respectively to the attach points after text position changed.
Added test cases to check text positioning with dimension parameters and with setting 3D point.
Corrected DRAW commands vmovedim, vangledim, vdistdim, vradiusdim.
Corrections of AIS_Dimension::SetTextPosition(): aspect parameters are not changed inside it.
Layout mode was removed; test cases and vdimparams, vdimension  commands were corrected.
remarks: coding style, removing redundant code of LayoutMode enumeration.
2014-03-25 16:22:45 +04:00
abv
ff0652d07d 0024607: Fix some GCC compiler warnings
- enumeration value not handled in switch in Aspect_ColorScale.cxx, TNaming_DeltaOnModification.cxx
- comparison between signed and unsigned integer expressions in NIS_Triangulated.cxx, OSD_MAllocHook.cxx, RWStl.cxx
- static function defined or declared but not used in OpenGl_Workspace_2.cxx, ProjLib_ComputeApprox.cxx
2014-03-25 16:22:03 +04:00
szv
025f247598 0024603: The code in TCollection_AsciiString::Search* methods can be simplified
Small improvement in TCollection_AsciiString::Search.
2014-03-25 16:22:02 +04:00
mmv
d626cbd702 0023427: Unused C-sources in OSD package
Deleted unused sources in OSD package
2014-03-25 16:22:01 +04:00
apn
8093bf8084 Added test case demo/samples/raytrace that show raytrace mode. 2014-03-25 16:21:00 +04:00
apn
d2279ef8ac Added TODO in test case bugs/modalg_3/bug615 in Debug mode (test case is bad, but behavior changes). 2014-03-25 16:20:59 +04:00
apn
786a7f3f91 Return cpulimit TODOs because test case doesn't execute always (it crashes by cpulimit in Debug mode). 2014-03-25 16:20:58 +04:00
pkv
8849da168a 0024597: Missing internal vertex in the result of General Fuse Operation
Changes:
class BOPDS_DS
   - method:
void BOPDS_DS::Init()
   - method:
void BOPDS_DS::FaceInfoIn
  (const Standard_Integer theF,
   BOPDS_IndexedMapOfPaveBlock& theMPB,
   BOPCol_MapOfInteger& theMI)
Add the information about internal vertices on faces to the Data Structure

Test case for issue CR24597
2014-03-25 16:20:57 +04:00
pkv
a6b634c30a 0023884: Boolean Fuse between two faces fails
fix for the bug v1
fix for the bug v1.1
Test case for issue CR23884
2014-03-25 16:20:56 +04:00
ama
ba76708cc0 0024591: Modification of tests in group "sewing"
Proper use of "freebounds" command in sewing testgrid: pload XSDRAW, reference data for checking free edges were added.
2014-03-25 16:20:19 +04:00
nbv
d48f15113e 0024472: Wrong section curves
1. Checking, if intersection curve is collapsed, is added. (file GeomInt_LineConstructor.cxx)
2. Earlier, intersection line was considered as valid if only mid-point of every interval of this line is into two intersected surfaces (with given tolerance). That's no good because after inserting of new points, old points, which is considered as valid only because they are into beginning or into end of interval (therefore, they was not checked), moved to mid of interval and became invalid. Therefore, checking for first and last points was added. (file GeomInt_LineConstructor.cxx)
3. Intersection line became valid (see bug description) after adding of new additional points into it (file IntPatch_PrmPrmIntersection.cxx). Methods for finding and adding of new points were added. (file IntWalk_PWalking_1.gxx)
Some test cases were changed.
Test cases for issue CR24472
2014-03-25 16:20:18 +04:00
emv
6aa799c976 0024208: Optimization of the edge-edge and edge-face intersection algorithms
New Edge/Edge intersection algorithm (based on the intersection between edges bounding boxes).
Small correction.
2014-03-25 16:20:17 +04:00
abv
9a81cca84b 0024588: Fix some ICC warning fixes
Some of ICC warning fixes reported in 0024574 are fixed
Remove redundant ifdef
2014-03-25 16:14:33 +04:00
abv
747301b6aa 0024587: Separate TCL samples for ray tracing and creation of bottle
New sample created for ray tracing in DRAW: samples/tcl/raytrace.tcl, rendering OCCT bottle with glass on a rectangular table, with shadows and reflections (if OpenCL is available). Sample bottle.tcl retains only modeling part.
2014-03-25 16:13:30 +04:00
bugmaster
3657feae69 Modified test case (increase cpulimit in Debug mode) 2014-03-25 16:10:16 +04:00
bugmaster
2e2b397924 Adjusting of testing case for current state of OCCT 2014-03-25 16:10:15 +04:00
szv
3672dea7c5 0024523: Colors and layers are lost during loopback test (read-write-read)
Command XGetShapeColor corrected to return generic color
2014-03-25 16:10:14 +04:00
jgv
de76a20cc8 0024573: Wrong result of 2d-offset algorithm on customer's shape
Test cases for issue CR24573
2014-03-25 16:10:13 +04:00
apn
0ccbaa485f 0024024: Slow import of specific STEP data
Added test case bugs/step/bug24024
2014-03-25 16:10:12 +04:00
kgv
f5600b5c5f 0024555: Visualization - the same text is rendered with shift at second time
Font_FTFont::loadGlyph() - use the same flags as RenderGlyph(), FT_LOAD_NO_HINTING has been missed.

Test cases for issue CR24555
2014-03-25 16:10:11 +04:00
ibs
f1b811561b 0024580: CMake doesn't unset becoming unused variables when 3rdparty's usage is switched off
unset becoming unused variables when freeimage, opencl, tbb and gl2ps are switched off
2014-03-25 16:10:10 +04:00
apn
d4caffe6fc 0002793: BinOcaf: low performance saving documents with large attributes
Testing case bugs/caf/bug2793 was created.
2014-03-25 16:10:09 +04:00
pkv
0f0559a79d 0024157: Parallelization of assembly part of BO
I. New features:
I.1 class BOPAlgo_ShellSplitter
The new class BOPAlgo_ShellSplitter has been added.
Purpose:  The class provides the splitting of the set of connected faces
	on separate loops

II. Changes:
II.1. class BOPAlgo_BuilderSolid
- method:
void BOPAlgo_BuilderSolid::PerformLoops()
the changes that provide parallel run the ShellSplitter algorithm have been done.

- method:
void BOPAlgo_BuilderSolid::PerformAreas()
the classification the grows and holes has been done using
the algorithm of unbalanced binary tree of overlapped bounding boxes
2014-03-25 16:10:08 +04:00
apl
60986042ab 0024564: Select3D_SensitiveFace gives inaccurate picking depth for AIS_Plane (interior selection)
1) Used more accurate Select3D_SensitiveTriangulation instead of Select3D_SensitiveFace for rectangular sensitives in AIS_Plane::ComputeSelection, AIS_Dimension::ComputeSelection
2) Test case for CR24564
2014-03-25 16:10:07 +04:00
jgv
5d531b8303 0024481: Test "Perform Infinite Point" provides wrong result for a solid
Test cases for issue CR24481
2014-03-25 16:10:06 +04:00
apl
29cbe9f7ec 0024569: AIS_InteractiveContext::Update(...) does not updates selection when changing AIS_Plane
1) Allow AIS_InteractiveContext::Update to check, re-project and recompute selection structures even if presentations are not "to be updated".
2) Test case bugs vis bug24569.

Small correction of test case for issue CR24569
2014-03-25 16:10:05 +04:00
nbv
4401e4e8ff 0024203: Command "sameparameter" in DRAW on attached edge set tolerance equal to 116.
Main problem:
Algorithm of locale extrema, which is called by "sameparameter" command, cannot find extrema because extremal point is far from initial point. Therefore, reparametrization of edge's curve (for same-parameter) cannot be made properly.

Solve:
Using of global extrema (see Approx_SameParameter.cxx).

As the given edge contains two 2d-curves and the second from them is problem, for select needed curve, an interface of "mk2dcurve" DRAW-command is changed. Now there can be used an index of curve (by default, index = 1, as earlier), see help for more detail information.

Test "heal advanced Z3":
Now checkshape finds only two invalid subshapes. Earlier, it found four subshapes. I think it is not regression. Therefore, test case was changed.

Tolerance reducing.

test
2014-03-25 16:07:37 +04:00
Roman Lygin
8db1c1c0d9 0023855: Old BOPs fail on Win7 64bit when using TBB
Minor code refactoring (readability)

Test case for issue CR23855
2014-03-25 16:07:10 +04:00
gka
efd74ba0db 0024517: Crash at StepToTopoDS_TranslateEdge::Init()
Fixed crash at StepToTopoDS_TranslateEdge::Init() for case when curve is absent)

Corrected error message for case of absence geom curve in edge curve
2014-03-25 16:05:51 +04:00
abv
26b5ba7eaa 0024536: GCC compiler warning on breakage of pointer aliasing rules in BRepFill_Evolved.cxx
Avoid storing result of call to TopoDS::Edge() as reference
2014-03-25 16:05:50 +04:00
dbp
1503bd7d5b 0024479: Ray Tracing mode does not work in Qt IE sample
Implementation of  Ray Tracing mode in standard Qt sample
Fix compile warnings in Qt samples.
Fix tabs in Common-string.ts.
Update Code style.

0024415: Update QT samples
Code which was based on QT3 was removed. Some bugs and warnings has been also fixed.
Porting from QT4 to QT5 sample files.
2014-03-25 16:05:49 +04:00
mkv
471dfc6c80 Update of testing case due to changes in issue 24370 2014-03-25 16:02:49 +04:00
bugmaster
fff7701c4b Correction of test cases for 24474 issue 2014-03-25 16:01:39 +04:00
2379 changed files with 74824 additions and 89780 deletions

View File

@@ -21,10 +21,12 @@ ENDIF()
MATH(EXPR COMPILER_BITNESS "32 + 32*(${CMAKE_SIZEOF_VOID_P}/8)")
SET( CMAKE_BUILD_TYPE ${BUILD_CONFIGURATION} CACHE INTERNAL "Build type of OCCT" FORCE )
SET(CMAKE_BUILD_TYPE ${BUILD_CONFIGURATION} CACHE INTERNAL "Build type of OCCT" FORCE )
SET( INSTALL_DIR "" CACHE PATH "Directory that will contain install files of OCCT" )
SET( CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
SET(INSTALL_DIR "" CACHE PATH "Directory that will contain install files of OCCT" )
SET(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE )
set(BUILD_PATCH_DIR "" CACHE PATH "directory with occt patch")
set (BUILD_TOOLKITS "" CACHE STRING "Toolkits are also included in OCCT")
separate_arguments(BUILD_TOOLKITS)
@@ -33,7 +35,22 @@ IF(MSVC)
SET(BUILD_Samples OFF CACHE BOOL "OCCT samples building")
ENDIF()
include(adm/cmake/CMakeModules.txt)
# consider for patch existence
SET (IS_PATCH_CURRENT "NO")
SET (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "")
SET (IS_PATCH_CURRENT "YES")
SET (TK_ROOT_DIR ${BUILD_PATCH_DIR})
ENDIF()
# include the list of patch modules if the one exists
# or include the list of original modules
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/cmake/CMakeModules.txt")
MESSAGE(STATUS "Info: the list of patched modules is included")
include(${BUILD_PATCH_DIR}/adm/cmake/CMakeModules.txt)
ELSE()
include(adm/cmake/CMakeModules.txt)
ENDIF()
if (WIN32)
set(SCRIPT_EXT bat)
@@ -45,28 +62,49 @@ if (MSVC)
add_definitions(/fp:precise)
endif()
# set compiler short name and choose SSE2 option for appropriate MSVC compilers
if (DEFINED MSVC70)
SET(COMPILER vc7)
elseif (DEFINED MSVC80)
SET(COMPILER vc8)
# choose SSE2 option for appropriate MSVC compilers
if (MSVC80 OR MSVC90 OR MSVC10)
if (${COMPILER_BITNESS} STREQUAL 32)
add_definitions(/arch:SSE2)
endif()
elseif (DEFINED MSVC90)
SET(COMPILER vc9)
if (${COMPILER_BITNESS} STREQUAL 32)
add_definitions(/arch:SSE2)
endif()
# set compiler short name
if (MSVC)
if (MSVC70)
set (COMPILER vc7)
elseif (MSVC80)
set (COMPILER vc8)
elseif (MSVC90)
set (COMPILER vc9)
elseif (MSVC10)
set (COMPILER vc10)
elseif (MSVC11)
set (COMPILER vc11)
endif()
elseif (DEFINED MSVC10)
SET(COMPILER vc10)
if (${COMPILER_BITNESS} STREQUAL 32)
add_definitions(/arch:SSE2)
endif()
elseif (DEFINED MSVC11)
SET(COMPILER vc11)
elseif (DEFINED CMAKE_COMPILER_IS_GNUCC)
set (COMPILER gcc)
elseif (DEFINED CMAKE_COMPILER_IS_GNUCXX)
set (COMPILER gxx)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set (COMPILER clang)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
set (COMPILER icc)
else()
SET(COMPILER ${CMAKE_GENERATOR})
set (COMPILER ${CMAKE_GENERATOR})
string (REGEX REPLACE " " "" COMPILER ${COMPILER})
endif()
if (WIN32)
SET(OS_WITH_BIT "win${COMPILER_BITNESS}")
elseif(APPLE)
SET(OS_WITH_BIT "mac${COMPILER_BITNESS}")
else()
SET(OS_WITH_BIT "lin${COMPILER_BITNESS}")
endif()
if (${COMPILER_BITNESS} STREQUAL 64)
add_definitions(-D_OCC64)
endif()
add_definitions(-DCSFDB)
@@ -128,10 +166,12 @@ install(FILES "${CMAKE_SOURCE_DIR}/src/UnitsAPI/Lexi_Expr.dat" DESTINATION "${I
install(FILES "${CMAKE_SOURCE_DIR}/src/UnitsAPI/Units.dat" DESTINATION "${INSTALL_DIR}/src/UnitsAPI" )
install(FILES "${CMAKE_SOURCE_DIR}/src/TObj/TObj.msg" DESTINATION "${INSTALL_DIR}/src/TObj" )
IF("${BUILD_CONFIGURATION}" STREQUAL "Release")
SET(BUILD_SUFFIX "")
IF("${BUILD_CONFIGURATION}" STREQUAL "Debug")
SET(3RDPARTY_BUILD_SUFFIX "") # debug == release
SET(BUILD_SUFFIX "d")
ELSE()
SET(BUILD_SUFFIX "") # debug == release
SET(3RDPARTY_BUILD_SUFFIX "")
SET(BUILD_SUFFIX "")
ENDIF()
FUNCTION(SUBDIRECTORY_NAMES MAIN_DIRECTORY RESULT)
@@ -241,7 +281,11 @@ MACRO(THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME)
IF(3RDPARTY_${PRODUCT_NAME}_DIR)
IF("${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
SET(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "Directory contains headers of the ${PRODUCT_NAME} product" FORCE)
FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/include" NO_DEFAULT_PATH)
if ("${PRODUCT_NAME}" STREQUAL "FREETYPE")
FIND_PATH(3RDPARTY_FREETYPE_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_FREETYPE_DIR}/include" "${3RDPARTY_FREETYPE_DIR}/include/freetype2" NO_DEFAULT_PATH)
else()
FIND_PATH(3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR ${HEADER_NAME} PATHS "${3RDPARTY_${PRODUCT_NAME}_DIR}/include" NO_DEFAULT_PATH)
endif()
ENDIF()
IF("${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_${PRODUCT_NAME}_LIBRARY}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_LIBRARY-NOTFOUND")
@@ -297,7 +341,7 @@ MACRO(THIRDPARTY_PRODUCT PRODUCT_NAME HEADER_NAME LIBRARY_NAME)
ENDIF()
IF(INSTALL_${PRODUCT_NAME})
INSTALL(FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
INSTALL(FILES "${3RDPARTY_${PRODUCT_NAME}_DLL}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
SET(3RDPARTY_${PRODUCT_NAME}_DLL_DIR "")
ELSE()
GET_FILENAME_COMPONENT(3RDPARTY_${PRODUCT_NAME}_DLL_DIR "${3RDPARTY_${PRODUCT_NAME}_DLL}" PATH)
@@ -325,13 +369,14 @@ IF(INSTALL_TCL)
SET (TCL_FOLDER_VERSION "")
ENDIF()
INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tcl${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tk${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tcl${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR_INSIDE}/${DLL_SO_PREFIX}tk${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
IF (IS_TCL_VERSION_FOUND)
INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl8" DESTINATION "${INSTALL_DIR}/lib")
INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tk${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
# tcl is required to install in lib folder (without ${BUILD_SUFFIX})
INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl8" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tcl${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR_INSIDE}/tk${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
ELSE()
MESSAGE(STATUS "\nWarning: tclX.X and tkX.X subdirs won't be copyied during the installation process.")
MESSAGE(STATUS "Try seeking tcl within another folder by changing 3RDPARTY_TCL_DIR variable.")
@@ -373,26 +418,20 @@ IF(USE_GLX)
ENDIF()
# FREETYPE
THIRDPARTY_PRODUCT("FREETYPE" "ft2build.h" "freetype${BUILD_SUFFIX}")
IF("${3RDPARTY_FREETYPE_INCLUDE_DIR}" STREQUAL "" OR "${3RDPARTY_FREETYPE_INCLUDE_DIR}" STREQUAL "3RDPARTY_${PRODUCT_NAME}_INCLUDE_DIR-NOTFOUND")
ELSEIF(EXISTS "${3RDPARTY_FREETYPE_INCLUDE_DIR}/freetype2/")
SET(3RDPARTY_INCLUDE_DIRS "${3RDPARTY_INCLUDE_DIRS};${3RDPARTY_FREETYPE_INCLUDE_DIR}/freetype2")
ENDIF()
THIRDPARTY_PRODUCT("FREETYPE" "ft2build.h" "freetype${3RDPARTY_BUILD_SUFFIX}")
# FREEIMAGE
IF(USE_FREEIMAGE)
ADD_DEFINITIONS(-DHAVE_FREEIMAGE)
THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "freeimage${BUILD_SUFFIX}")
THIRDPARTY_PRODUCT("FREEIMAGE" "FreeImage.h" "freeimage${3RDPARTY_BUILD_SUFFIX}")
IF(WIN32)
IF("${3RDPARTY_FREEIMAGE_DIR}" STREQUAL "")
ELSE()
SET (3RDPARTY_FREEIMAGEPLUS_DIR "${3RDPARTY_FREEIMAGE_DIR}")
ENDIF()
THIRDPARTY_PRODUCT("FREEIMAGEPLUS" "FreeImagePlus.h" "freeimageplus${BUILD_SUFFIX}")
THIRDPARTY_PRODUCT("FREEIMAGEPLUS" "FreeImagePlus.h" "freeimageplus${3RDPARTY_BUILD_SUFFIX}")
ENDIF()
ELSE()
@@ -405,7 +444,7 @@ ENDIF()
# GL2PS
IF(USE_GL2PS)
ADD_DEFINITIONS(-DHAVE_GL2PS)
THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "gl2ps${BUILD_SUFFIX}")
THIRDPARTY_PRODUCT("GL2PS" "gl2ps.h" "gl2ps${3RDPARTY_BUILD_SUFFIX}")
ELSE()
CHECK_AND_UNSET_GROUP ("3RDPARTY_GL2PS")
CHECK_AND_UNSET ("INSTALL_GL2PS")
@@ -434,14 +473,17 @@ IF(USE_OPENCL)
ENDIF()
THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL${BUILD_SUFFIX}")
THIRDPARTY_PRODUCT("OPENCL" "CL/cl.h" "OpenCL${3RDPARTY_BUILD_SUFFIX}")
# if CL/cl.h isn't found (and 3RDPARTY_OPENCL_INCLUDE_DIR isn't defined)
# then try to find OpenCL/cl.h (all other variable won't be changed)
THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL${BUILD_SUFFIX}")
IF("${3RDPARTY_OPENCL_INCLUDE_DIR}" STREQUAL "" OR "${3RDPARTY_OPENCL_INCLUDE_DIR}" STREQUAL "3RDPARTY_OPENCL_INCLUDE_DIR-NOTFOUND")
THIRDPARTY_PRODUCT("OPENCL" "OpenCL/cl.h" "OpenCL${3RDPARTY_BUILD_SUFFIX}")
ENDIF()
ELSE()
CHECK_AND_UNSET_GROUP ("3RDPARTY_OPENCL")
CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_HEADER")
CHECK_AND_UNSET ("3RDPARTY_OPENCL_ADDITIONAL_PATH_FOR_LIB")
CHECK_AND_UNSET ("INSTALL_OPENCL")
ENDIF()
@@ -453,7 +495,7 @@ IF (USE_TBB)
INCLUDE(adm/templates/tbb.cmake)
IF(INSTALL_TBB)
INSTALL(FILES "${3RDPARTY_TBB_DLL}" "${3RDPARTY_TBB_MALLOC_DLL}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
INSTALL(FILES "${3RDPARTY_TBB_DLL}" "${3RDPARTY_TBB_MALLOC_DLL}" DESTINATION "${INSTALL_DIR}/${OS_WITH_BIT}/${COMPILER}/${DLL_SO_FOLDER}${BUILD_SUFFIX}")
SET(3RDPARTY_TBB_DLL_DIR "")
SET(3RDPARTY_TBB_MALLOC_DLL_DIR "")
@@ -489,26 +531,112 @@ IF("${INSTALL_DIR}" STREQUAL "")
MESSAGE(FATAL_ERROR "INSTALL_DIR is empty")
ELSE()
# inc,data,tests DIRECTORY
install(DIRECTORY "${CMAKE_SOURCE_DIR}/inc" DESTINATION "${INSTALL_DIR}" )
install(DIRECTORY "${CMAKE_SOURCE_DIR}/data" DESTINATION "${INSTALL_DIR}" )
install(DIRECTORY "${CMAKE_SOURCE_DIR}/inc" DESTINATION "${INSTALL_DIR}")
install(DIRECTORY "${CMAKE_SOURCE_DIR}/data" DESTINATION "${INSTALL_DIR}")
install(DIRECTORY "${CMAKE_SOURCE_DIR}/samples/tcl" DESTINATION "${INSTALL_DIR}/samples")
IF(INSTALL_TESTS)
install(DIRECTORY "${CMAKE_SOURCE_DIR}/tests" DESTINATION "${INSTALL_DIR}" )
ENDIF()
# install patch inc, data, tests folder
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "")
IF(EXISTS "${BUILD_PATCH_DIR}/inc")
install(DIRECTORY "${BUILD_PATCH_DIR}/inc" DESTINATION "${INSTALL_DIR}" )
ENDIF()
IF(EXISTS "${BUILD_PATCH_DIR}/data")
install(DIRECTORY "${BUILD_PATCH_DIR}/data" DESTINATION "${INSTALL_DIR}" )
ENDIF()
IF(INSTALL_TESTS)
IF(EXISTS "${BUILD_PATCH_DIR}/tests")
install(DIRECTORY "${BUILD_PATCH_DIR}/tests" DESTINATION "${INSTALL_DIR}" )
ENDIF()
ENDIF()
ENDIF()
# DRAW.BAT or DRAW.SH
install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_WRITE GROUP_EXECUTE
WORLD_READ WORLD_WRITE WORLD_EXECUTE)
IF (BUILD_Samples)
install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/sample.bat" DESTINATION "${INSTALL_DIR}")
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}")
install(FILES "${BUILD_PATCH_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}" PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
ELSE()
install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}" PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
ENDIF()
SET(CUSTOM_CUR "custom_${COMPILER}_${COMPILER_BITNESS}_${BUILD_SUFFIX}.${SCRIPT_EXT}")
if (WIN32)
SET (CUSTOM_ADD_CONTENT "\nif exist \"%~dp0${CUSTOM_CUR}\" (\n call \"%~dp0${CUSTOM_CUR}\" %1 %2 %3 \n)")
else()
SET (CUSTOM_ADD_CONTENT "\nif [ -e \"\${aScriptPath}/${CUSTOM_CUR}\" ]; then\n source \"\${aScriptPath}/${CUSTOM_CUR}\" \"\${COMPILER}\" \"\${WOKSTATION}\${ARCH}\" \"\${CASDEB}\" \nfi")
endif()
# change custom.bat/sh
if (EXISTS "${INSTALL_DIR}/custom.${SCRIPT_EXT}")
FILE(READ "${INSTALL_DIR}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
SET (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${CUSTOM_ADD_CONTENT}")
FILE(WRITE "${INSTALL_DIR}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
else()
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.main")
configure_file("${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" @ONLY)
ELSE()
configure_file("${CMAKE_SOURCE_DIR}/adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" @ONLY)
ENDIF()
install(FILES "${OCCT_BINARY_DIR}/custom.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}")
endif()
# write current custom.bat/sh
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.in")
configure_file("${BUILD_PATCH_DIR}/adm/templates/custom.${SCRIPT_EXT}.in" ${CUSTOM_CUR} @ONLY)
ELSE()
configure_file("${CMAKE_SOURCE_DIR}/adm/templates/custom.${SCRIPT_EXT}.in" ${CUSTOM_CUR} @ONLY)
ENDIF()
configure_file("${CMAKE_SOURCE_DIR}/adm/templates/env.${SCRIPT_EXT}.in" env.${SCRIPT_EXT} @ONLY)
install(FILES "${OCCT_BINARY_DIR}/${CUSTOM_CUR}" DESTINATION "${INSTALL_DIR}" )
IF (BUILD_Samples)
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/sample.bat")
install(FILES "${BUILD_PATCH_DIR}/adm/templates/sample.bat" DESTINATION "${INSTALL_DIR}")
ELSE()
install(FILES "${CMAKE_SOURCE_DIR}/adm/templates/sample.bat" DESTINATION "${INSTALL_DIR}")
ENDIF()
ENDIF()
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/templates/env.${SCRIPT_EXT}.in")
configure_file("${BUILD_PATCH_DIR}/adm/templates/env.${SCRIPT_EXT}.in" env.${SCRIPT_EXT} @ONLY)
ELSE()
configure_file("${CMAKE_SOURCE_DIR}/adm/templates/env.${SCRIPT_EXT}.in" env.${SCRIPT_EXT} @ONLY)
ENDIF()
install(FILES "${OCCT_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR}" )
ENDIF()
include(adm/cmake/CMakeToolKitsDeps.txt)
# include patched toolkit projects or original ones
SET (UNSUBDIRS "")
IF(NOT "${BUILD_PATCH_DIR}" STREQUAL "" AND EXISTS "${BUILD_PATCH_DIR}/adm/cmake/CMakeToolKitsDeps.txt")
include(${BUILD_PATCH_DIR}/adm/cmake/CMakeToolKitsDeps.txt)
ELSE()
SET (IS_PATCH_CURRENT "NO")
SET (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
include(adm/cmake/CMakeToolKitsDeps.txt)
ENDIF()
# include some required original toolkit
IF(NOT "${UNSUBDIRS}" STREQUAL "")
SET (IS_PATCH_CURRENT "NO")
SET (TK_ROOT_DIR ${CMAKE_SOURCE_DIR})
# add required subdirs
FOREACH(UNSUBDIR ${UNSUBDIRS})
MESSAGE(STATUS "${UNSUBDIR}")
subdirs(${TK_ROOT_DIR}/${UNSUBDIR})
ENDFOREACH()
ENDIF()
# samples do not support patch usage
IF (BUILD_Samples)
SET (CMAKE_MFC_FLAG 2)
SET (OCCT_ROOT ${CMAKE_SOURCE_DIR})

View File

@@ -3,7 +3,6 @@ n NCollection
p BSplCLib
p BSplSLib
p Bnd
p BVH
p CSLib
p Convert
p Dico
@@ -133,7 +132,9 @@ p FairCurve
p FilletSurf
p GccAna
p GccEnt
p GccGeo
p GccInt
p GccIter
p Geom2dAPI
p Geom2dGcc
p Geom2dHatch
@@ -169,6 +170,7 @@ p MAT
p MAT2d
p NLPlate
p Plate
p Primitives
p ShapeAlgo
p ShapeAnalysis
p ShapeBuild
@@ -270,6 +272,8 @@ p ObjMgt
p PBRep
p PCDM
p PCDMShape
p PColPGeom
p PColPGeom2d
p PColStd
p PColgp
p PCollection

View File

@@ -0,0 +1,14 @@
echo off
if "%VCVER%" == "@COMPILER@" (
if "%ARCH%" == "@COMPILER_BITNESS@" (
if "%CASDEB%" == "@BUILD_SUFFIX@" (
set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@"
set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@"
set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIR@"
set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIR@"
set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
)
)
)

View File

@@ -0,0 +1,12 @@
echo off
if not ["%1"] == [""] set "VCVER=%1"
if not ["%2"] == [""] set "ARCH=%2"
if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
if /I ["%3"] == ["debug"] set "CASDEB=d"
if /I ["%3"] == ["d"] set "CASDEB=d"
rem include other custom.bat files with specific 3rdparty paths
@CUSTOM_ADD_CONTENT@

View File

@@ -0,0 +1,14 @@
#!/bin/bash
if [ "$COMPILER" == "@COMPILER@" ]; then
if [ "$ARCH" == "@COMPILER_BITNESS@" ]; then
if [ "$CASDEB" == "@BUILD_SUFFIX@" ]; then
export TCL_DIR="@3RDPARTY_TCL_DLL_DIR@"
export FREETYPE_DIR="@3RDPARTY_FREETYPE_DLL_DIR@"
export FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_DLL_DIR@"
export GL2PS_DIR="@3RDPARTY_GL2PS_DLL_DIR@"
export TBB_DIR="@3RDPARTY_TBB_DLL_DIR@"
fi
fi
fi

View File

@@ -0,0 +1,4 @@
#!/bin/bash
@CUSTOM_ADD_CONTENT@

View File

@@ -1,7 +1,10 @@
@echo off
rem Setup environment and launch DRAWEXE
call "%~dp0env.bat"
call "%~dp0env.bat" %1 %2 %3
echo Hint: use "pload ALL" command to load standard commands
DRAWEXE.exe
"%CASROOT%/%BIN_TAIL%/DRAWEXE.exe"
set "PATH=%ORIGIN_PATH%"

View File

@@ -2,7 +2,7 @@
aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD";
source "${aScriptPath}/env.sh"
source "${aScriptPath}/env.sh" "$1"
echo 'Hint: use "pload ALL" command to load standard commands'
DRAWEXE

View File

@@ -3,25 +3,34 @@ echo off
set "SCRIPTROOT=%~dp0"
set "SCRIPTROOT=%SCRIPTROOT:~0,-1%"
set "VCVER=@COMPILER@"
set "ARCH=@COMPILER_BITNESS@"
set "CASDEB=@BUILD_SUFFIX@"
if not ["%1"] == [""] set "VCVER=%1"
if not ["%2"] == [""] set "ARCH=%2"
if /I ["%ARCH%"] == ["win32"] set "ARCH=32"
if /I ["%ARCH%"] == ["win64"] set "ARCH=64"
if /I ["%3"] == ["debug"] set "CASDEB=d"
if /I ["%3"] == ["d"] set "CASDEB=d"
if exist "%~dp0custom.bat" (
call "%~dp0custom.bat" %1 %2 %3
)
if ["%CASROOT%"] == [""] set "CASROOT=%SCRIPTROOT%"
set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@"
if not ["%TCL_DIR%"] == [""] set "PATH=%TCL_DIR%;%PATH%"
set "ORIGIN_PATH=%PATH%"
set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@"
if not ["%FREETYPE_DIR%"] == [""] set "PATH=%FREETYPE_DIR%;%PATH%"
set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIR@"
if not ["%TCL_DIR%"] == [""] set "PATH=%TCL_DIR%;%PATH%"
if not ["%FREETYPE_DIR%"] == [""] set "PATH=%FREETYPE_DIR%;%PATH%"
if not ["%FREEIMAGE_DIR%"] == [""] set "PATH=%FREEIMAGE_DIR%;%PATH%"
set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIR@"
if not ["%GL2PS_DIR%"] == [""] set "PATH=%GL2PS_DIR%;%PATH%"
set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@"
if not ["%TBB_DIR%"] == [""] set "PATH=%TBB_DIR%;%PATH%"
if not ["%GL2PS_DIR%"] == [""] set "PATH=%GL2PS_DIR%;%PATH%"
if not ["%TBB_DIR%"] == [""] set "PATH=%TBB_DIR%;%PATH%"
rem ----- Set path to 3rd party and OCCT libraries -----
set "PATH=%CASROOT%\bin;%PATH%"
set "BIN_TAIL=win%ARCH%/%VCVER%/bin%CASDEB%"
set "PATH=%CASROOT%/%BIN_TAIL%;%PATH%"
rem ----- Set envoronment variables used by OCCT -----
set CSF_LANGUAGE=us
@@ -56,4 +65,5 @@ if exist "%CASROOT%\src\DrawResources" (
if exist "%CASROOT%\src\DrawResourcesProducts" (
set "CSF_DrawPluginProductsDefaults=%CASROOT%\src\DrawResourcesProducts"
)
)

View File

@@ -6,63 +6,74 @@ if [ "${CASROOT}" == "" ]; then
export CASROOT="${aScriptPath}"
fi
aLibPath="${CASROOT}/lib"
# Read script arguments
shopt -s nocasematch
export CASDEB="@BUILD_SUFFIX@";
if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
shopt -u nocasematch
TCL_DIR="@3RDPARTY_TCL_DLL_DIR@"
if [ "$TCL_DIR" != "" ]; then
aLibPath="${TCL_DIR}:${aLibPath}"
fi
FREETYPE_DIR="@3RDPARTY_FREETYPE_DLL_DIR@"
if [ "$FREETYPE_DIR" != "" ]; then
aLibPath="${FREETYPE_DIR}:${aLibPath}"
fi
FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_DLL_DIR@"
if [ "$FREEIMAGE_DIR" != "" ]; then
aLibPath="${FREEIMAGE_DIR}:${aLibPath}"
fi
GL2PS_DIR="@3RDPARTY_GL2PS_DLL_DIR@"
if [ "$GL2PS_DIR" != "" ]; then
aLibPath="${GL2PS_DIR}:${aLibPath}"
fi
TBB_DIR="@3RDPARTY_TBB_DLL_DIR@"
if [ "$TBB_DIR" != "" ]; then
aLibPath="${TBB_DIR}:${aLibPath}"
fi
export COMPILER="@COMPILER@"
# ----- Set path to 3rd party and OCCT libraries -----
aSystem=`uname -s`
if [ "$aSystem" == "Darwin" ]; then
export WOKSTATION="mac";
if [ "$DYLD_LIBRARY_PATH" != "" ]; then
export DYLD_LIBRARY_PATH="${aLibPath}:${DYLD_LIBRARY_PATH}"
else
export DYLD_LIBRARY_PATH="${aLibPath}"
fi
else
export WOKSTATION="lin";
if [ "$LD_LIBRARY_PATH" != "" ]; then
export LD_LIBRARY_PATH="${aLibPath}:${LD_LIBRARY_PATH}"
else
export LD_LIBRARY_PATH="${aLibPath}"
fi
fi
# ----- Set path to OCCT executables -----
PATH="${PATH}:${CASROOT}/bin"
# ----- Setup Environment Variables -----
anArch=`uname -m`
if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
export ARCH="32";
else
export ARCH="64";
fi
aSystem=`uname -s`
if [ "$aSystem" == "Darwin" ]; then
export WOKSTATION="mac";
export ARCH="64";
else
export WOKSTATION="lin";
fi
# ----- Set local settings -----
if [ -e "${aScriptPath}/custom.sh" ]; then
source "${aScriptPath}/custom.sh" "${COMPILER}" "${WOKSTATION}${ARCH}" "${CASDEB}"
fi
THRDPARTY_PATH=""
if [ "$TCL_DIR" != "" ]; then
THRDPARTY_PATH="${TCL_DIR}:${THRDPARTY_PATH}"
fi
if [ "$FREETYPE_DIR" != "" ]; then
THRDPARTY_PATH="${FREETYPE_DIR}:${THRDPARTY_PATH}"
fi
if [ "$FREEIMAGE_DIR" != "" ]; then
THRDPARTY_PATH="${FREEIMAGE_DIR}:${THRDPARTY_PATH}"
fi
if [ "$GL2PS_DIR" != "" ]; then
THRDPARTY_PATH="${GL2PS_DIR}:${THRDPARTY_PATH}"
fi
if [ "$TBB_DIR" != "" ]; then
THRDPARTY_PATH="${TBB_DIR}:${THRDPARTY_PATH}"
fi
BIN_PATH="${WOKSTATION}${ARCH}/${COMPILER}/bin${CASDEB}"
LIBS_PATH="${WOKSTATION}${ARCH}/${COMPILER}/lib${CASDEB}"
export PATH="${CASROOT}/${BIN_PATH}:${PATH}"
if [ "$LD_LIBRARY_PATH" != "" ]; then
export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${THRDPARTY_PATH}:${LD_LIBRARY_PATH}"
else
export LD_LIBRARY_PATH="${CASROOT}/${LIBS_PATH}:${THRDPARTY_PATH}"
fi
if [ "$WOKSTATION" == "mac" ]; then
if [ "$DYLD_LIBRARY_PATH" != "" ]; then
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
else
export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
fi
fi
# ----- Set envoronment variables used by OCCT -----
@@ -98,4 +109,5 @@ fi
if [ -e "${CASROOT}/src/DrawResourcesProducts" ]; then
export CSF_DrawPluginProductsDefaults="${CASROOT}/src/DrawResourcesProducts"
fi
fi

View File

@@ -2,7 +2,9 @@
if ["%1"] == [""] (
echo Launch selected sample as follows:
echo sample.bat SampleName
echo sample.bat SampleName vc10 win32 d
echo or to use last sample build configuration:
echo sample.bat SampleName
echo available samples:
echo Geometry
echo Modeling
@@ -17,12 +19,13 @@ if ["%1"] == [""] (
exit /B
)
if not exist "%~dp0/bin/%1.exe" (
echo Executable %~dp0/bin/%4.exe not found.
call "%~dp0env.bat" %2 %3 %4
if not exist "%~dp0/%BIN_TAIL%/%1.exe" (
echo Executable %~dp0/%BIN_TAIL%/%1.exe not found.
echo Probably you didn't compile the application.
exit /B
)
call "%~dp0/env.bat"
"%~dp0/%BIN_TAIL%/%1.exe"
"%~dp0/bin/%1.exe"

View File

@@ -64,7 +64,7 @@ IF("${3RDPARTY_TCL_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TC
IF(NOT "${3RDPARTY_TCL_DIR}" STREQUAL "")
FIND_LIBRARY(3RDPARTY_TCL_LIBRARY
NAMES tcl tcl8${TCL_SEP}6 tcl8${TCL_SEP}5
NAMES tcl8${TCL_SEP}6 tcl8${TCL_SEP}5 tcl
PATHS "${3RDPARTY_TCL_DIR}/lib" NO_DEFAULT_PATH)
ELSE()
SET(3RDPARTY_TCL_POSSIBLE_LIBRARIES_DIRS /usr/lib /usr/local/lib)
@@ -81,16 +81,16 @@ IF("${3RDPARTY_TCL_LIBRARY}" STREQUAL "" OR CHANGES_ARE_NEEDED OR "${3RDPARTY_TC
# check default path (with additions) for library search
FIND_LIBRARY(3RDPARTY_TCL_LIBRARY
NAMES tcl tcl8${TCL_SEP}6 tcl8${TCL_SEP}5
NAMES tcl8${TCL_SEP}6 tcl8${TCL_SEP}5 tcl
PATHS ${3RDPARTY_TCL_POSSIBLE_LIBRARIES_DIRS})
ENDIF()
ENDIF()
#search the version of found tcl library
IF("${3RDPARTY_TCL_LIBRARY}" STREQUAL "" OR "${3RDPARTY_TCL_LIBRARY}" STREQUAL "3RDPARTY_TCL_LIBRARY-NOTFOUND")
SET (TCL_DLL_SO_NAMES ${DLL_SO_PREFIX}tcl.${DLL_SO}
SET (TCL_DLL_SO_NAMES ${DLL_SO_PREFIX}tcl8${TCL_SEP}6.${DLL_SO}
${DLL_SO_PREFIX}tcl8${TCL_SEP}5.${DLL_SO}
${DLL_SO_PREFIX}tcl8${TCL_SEP}6.${DLL_SO} )
${DLL_SO_PREFIX}tcl.${DLL_SO})
ELSE()
GET_FILENAME_COMPONENT(TCL_LIBRARY_NAME "${3RDPARTY_TCL_LIBRARY}" NAME)

View File

@@ -18,14 +18,13 @@ user_guides/user_guides.md
user_guides/foundation_classes/foundation_classes.md
user_guides/modeling_data/modeling_data.md
user_guides/modeling_algos/modeling_algos.md
user_guides/boolean_operations/boolean_operations.md
user_guides/shape_healing/shape_healing.md
user_guides/visualization/visualization.md
user_guides/iges/iges.md
user_guides/step/step.md
user_guides/xde/xde.md
user_guides/ocaf/ocaf.md
user_guides/tobj/tobj.md
user_guides/shape_healing/shape_healing.md
user_guides/draw_test_harness.md
user_guides/brep_wp/brep_wp.md
user_guides/ocaf_functionmechanism_wp/ocaf_functionmechanism_wp.md

View File

@@ -9,12 +9,11 @@ user_guides/foundation_classes/foundation_classes.md
user_guides/iges/iges.md
user_guides/modeling_data/modeling_data.md
user_guides/modeling_algos/modeling_algos.md
user_guides/boolean_operations/boolean_operations.md
user_guides/shape_healing/shape_healing.md
user_guides/ocaf/ocaf.md
user_guides/ocaf_functionmechanism_wp/ocaf_functionmechanism_wp.md
user_guides/ocaf_tree_wp/ocaf_tree_wp.md
user_guides/ocaf_wp/ocaf_wp.md
user_guides/shape_healing/shape_healing.md
user_guides/step/step.md
user_guides/draw_test_harness.md
user_guides/tobj/tobj.md

View File

@@ -18,58 +18,55 @@ instructions for your platform in @ref occt_dev_guides__building.
## Decide on location of build and install directories.
The build directory is the one where intermediate files will be created (projects / makefiles, objects, binaries).
The install directory is the one where binaries will be installed after build,
along with header files and resources required for OCCT use in applications.
Each configuration to be built should have its own build directory.
OCCT CMake scripts assume use of separate build and one install directories
for each configuration (Debug or Release).
The install directory is the one where binaries will be installed after build, along with header files and resources required for OCCT use in applications.
It is possible to install several configurations of OCCT (differentiated by platform, bitness, compiler, and build type) into the same directory.
It is recommended to separate build and install directories from OCCT source directory, for example:
/user/home/occt/ - sources
/user/home/tmp/occt-build-release - intermediate files (release)
/user/home/occt-install-release - installed binaries (release)
/user/home/occt/ - sources
/user/home/tmp/occt-build-vc10-x64-release - intermediate files
/user/home/occt-install - installed binaries
## CMake usage
Run CMake indicating path to OCCT sources ($CASROOT; in previous example
CASROOT equal to /user/home/occt in lin case, and d:/occt in windows case)
and selected build directory (in prev example build directory is
/user/home/tmp/occt-build-release).
Run CMake indicating path to OCCT sources ($CASROOT) and selected build directory.
It is recommended to use GUI tools provided by CMake: cmake-gui on Windows
and Mac, ccmake on Linux.
It is recommended to use GUI tools provided by CMake: cmake-gui on Windows and Mac, ccmake or cmake-gui on Linux.
### Windows:
@image html /dev_guides/building/cmake/images/cmake_image001.png
@image latex /dev_guides/building/cmake/images/cmake_image001.png
Specify the root folder of OCCT ($CASROOT, it contains CMakelists.txt file) by clicking Browse Source.
* Specify "main" CMakelists.txt meta-project location by clicking Browse Source (e.g., $CASROOT)
* Specify location (build folder) for Cmake generated project files by clicking Browse Build (e.g., d:/occt/build/win32-vc9-debug) (each cmake configuration of the project uses a specific build directory and a specific directory for installed files. It is recommended to compose names of the binary and install directory from system, bitness, compiler and build type.)
* Configure opens the window with a drop-down list of generators supported by CMake project. Select the required generator (e.g., Visual Studio 2008) and click Finish)
@figure{/dev_guides/building/cmake/images/cmake_image001.png}
@image html /dev_guides/building/cmake/images/cmake_image002.png
@image latex /dev_guides/building/cmake/images/cmake_image002.png
Specify location (build folder) for Cmake generated project files by clicking Browse Build.
Each configuration of the project should be built in its own directory.
When building multiple configurations it is recommended to compose name of build directories including system, bitness, compiler, and build type (e.g., d:/occt/build/win32-vc9-debug).
### Linux:
Configure opens the window with a drop-down list of generators supported by CMake project. Select the required generator (e.g., Visual Studio 2008) and click Finish.
@figure{/dev_guides/building/cmake/images/cmake_image002.png}
### Linux (ccmake variant):
In the console, change to the build directory and call ccmake with the path to the source directory of the project:
> cd ~/occt/build/debug
> ccmake ~/occt
@image html /dev_guides/building/cmake/images/cmake_image003.png
@image latex /dev_guides/building/cmake/images/cmake_image003.png
@figure{/dev_guides/building/cmake/images/cmake_image003.png}
Press "c" to configure.
Use of *cmake-gui* is the same as described above for Windows.
### Mac OS:
Use cmake-gui (Applications -> CMake 2.8-10.app) to generate project files for the chosen build environment (e.g., XCode).
@image html /dev_guides/building/cmake/images/cmake_image004.png
@image latex /dev_guides/building/cmake/images/cmake_image004.png
@figure{/dev_guides/building/cmake/images/cmake_image004.png}
## OCCT Configuration
@@ -83,36 +80,37 @@ The variables with "BUILD_" prefix allow specifying OCCT components and
configuration to be built:
* BUILD_CONFIGURATION - defines configuration to be built (Release by default).
* BUILD_<MODULE> - specify whether corresponding OCCT module should be
built (all toolkits). Note that even if whole module is not
selected for build, its toolkits used by other toolkits
selected for build will be included automatically.
* BUILD_TOOLKITS - allows including additional toolkits from non-selected
modules (should be list of toolkit names separated by a
space or a semicolon).
* BUILD_SAMPLES - specify whether OCCT MFC samples should be built.
* BUILD_<MODULE> - specify whether corresponding OCCT module should be
built (all toolkits). Note that even if whole module is not
selected for build, its toolkits used by other toolkits
selected for build will be included automatically.
* BUILD_TOOLKITS - allows including additional toolkits from non-selected
modules (should be list of toolkit names separated by a
space or a semicolon).
* BUILD_SAMPLES - specify whether OCCT MFC samples should be built.
* BUILD_PATCH_DIR - optionally specify additional folder containing patched OCCT source files.
The patch may contain arbitrary subset of OCCT source files (including CMake scripts, templates, etc.), organized in the same structure of folders as OCCT.
The projects generated by CMake will use files found in the patch folder instead of corresponding files of OCCT.
Check variables with "USE_" prefix (USE_FREEIMAGE, USE_GL2PS, USE_TBB, and
USE_OPENCL) if you want to enable use of the corresponding optional 3rd-party
library.
### 3rd-party configuration
### 3rd-party configuration (The variables with 3RDPARTY_ prefix)
If you have 3rd-party libraries in a non-default location
(e.g., on Windows, binaries downloaded from "http://www.opencascade.org/getocc/download/3rdparty/"),
specify 3RDPARTY_DIR variable that points to the folders of 3rdparty products (some or all).
At the next configuration 3rd-party product paths stored in 3RDPARTY_\<PRODUCT\>_DIR variable
will be searched for in 3RDPARTY_DIR directory. If the structure of 3RDPARTY_DIR directory
is the same as adopted in the OCCT, the directory will contain product dir, lib and header files.
specify 3RDPARTY_DIR variable that points to the folders of 3rdparty libraries (some or all).
At the next configuration step the 3rd-party libraries will be searched for in 3RDPARTY_DIR directory, and stored in 3RDPARTY_\<LIBRARY\>_DIR variables.
The procedure expects to find binary and header files of each 3rd-party library in its own sub-directory, separated by sub-directories *bin*, *lib*, and *include*.
Press "Configure" ("c" key for ccmake).
The result of the 3rdparty product search will be recorded in the corresponding variables:
* 3RDPARTY_\<PRODUCT\>_DIR - path to the product directory (with directory name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32)
* 3RDPARTY_\<PRODUCT\>_LIBRARY - path to the .lib libraries (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/lib/tcl85.lib). In non-windows case, this variable is the same as 3RDPARTY_\<PRODUCT\>_DLL.
* 3RDPARTY_\<PRODUCT\>_LIBRARY - path to the .lib libraries (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/lib/tcl85.lib).
In non-windows case, this variable is the same as 3RDPARTY_\<PRODUCT\>_DLL.
* 3RDPARTY_\<PRODUCT\>_INCLUDE - path to the include directory that contains the required header file (with "include" name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/include including tcl.h)
* 3RDPARTY_\<PRODUCT\>_DLL - path to the .dll/.so/.dylib library (with the library name) (e.g., D:/3rdparty/Tcl-8.5.12.0-32/bin/tcl85.dll)
@@ -156,8 +154,7 @@ can be changed to
and the related variables: 3RDPARTY_FREETYPE_DLL, 3RDPARTY_FREETYPE_INCLUDE_DIR and 3RDPARTY_FREETYPE_LIBRARY will be cleared.
@image html /dev_guides/building/cmake/images/cmake_image005.png
@image latex /dev_guides/building/cmake/images/cmake_image005.png
@figure{/dev_guides/building/cmake/images/cmake_image005.png}
During configuration process the cleaned variables will be filled with new found values.
@@ -181,8 +178,7 @@ Then the project files will appear in the build folder (e.g., d:/occt/build/win3
When the configuration is complete, start the generation process by pressing "g".
@image html /dev_guides/building/cmake/images/cmake_image006.png
@image latex /dev_guides/building/cmake/images/cmake_image006.png
@figure{/dev_guides/building/cmake/images/cmake_image006.png}
### Mac OS X
@@ -227,6 +223,3 @@ When the building process finished, build the INSTALL project
to move the above files to INSTALL_DIR.
Notice that env.sh (configure PATH and DYLD_LIBRARY_PATH environment variables
as well as Draw Harness extra variables) and draw.sh (to launch DRAWEXE) will be created in target directory.
## OCCT project debugging for Visual Studio
Run OCCT.bat from the build directory to start Visual Studio with required environment for debugging.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 57 KiB

View File

@@ -43,8 +43,8 @@ const char* DBRep_Set (const char* theNameStr, void* theShapePtr)
~~~~~
Sets the specified shape as a value of DRAW interpreter variable with the given name.
- *theNameStr* - the DRAW interpreter variable name to set.
- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
- *theNameStr* the DRAW interpreter variable name to set.
- *theShapePtr* a pointer to *TopoDS_Shape* variable.
~~~~~
const char* DrawTrSurf_Set (const char* theNameStr, void* theHandlePtr)
@@ -53,10 +53,10 @@ const char* DrawTrSurf_SetPnt2d (const char* theNameStr, void* thePnt2dPtr)
~~~~~
Sets the specified geometric object as a value of DRAW interpreter variable with the given name.
- *theNameStr* - the DRAW interpreter variable name to set.
- *theHandlePtr* - a pointer to the geometric variable (Handle to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
- *thePntPtr* - a pointer to the variable of type *gp_Pnt* to be set.
- *thePnt2dPtr* - a pointer to the variable of type *gp_Pnt2d* to be set.
- *theNameStr* the DRAW interpreter variable name to set.
- *theHandlePtr* a pointer to the geometric variable (Handle to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
- *thePntPtr* a pointer to the variable of type *gp_Pnt* to be set.
- *thePnt2dPtr* a pointer to the variable of type *gp_Pnt2d* to be set.
All these functions are defined in *TKDraw* toolkit and return a string indicating the result of execution.
@@ -69,8 +69,8 @@ const char* BRepTools_Write (const char* theFileNameStr, void* theShapePtr)
~~~~~
Saves the specified shape to a file with the given name.
- *theFileNameStr* - the DRAW interpreter variable name to set.
- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
- *theFileNameStr* the DRAW interpreter variable name to set.
- *theShapePtr* a pointer to *TopoDS_Shape* variable.
~~~~~
const char* BRepTools_Dump (void* theShapePtr)
@@ -78,7 +78,7 @@ const char* BRepTools_DumpLoc (void* theShapePtr)
~~~~~
Dumps shape or its location to cout.
- *theShapePtr* - a pointer to *TopoDS_Shape* variable.
- *theShapePtr* a pointer to *TopoDS_Shape* variable.
The following additional function is provided by *TKGeomBase* toolkit:
@@ -87,7 +87,7 @@ const char* GeomTools_Dump (void* theHandlePtr)
~~~~~
Dump geometric object to cout.
- *theHandlePtr* - a pointer to the geometric variable (<i>Handle</i> to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
- *theHandlePtr* a pointer to the geometric variable (<i>Handle</i> to *Geom_Geometry* or *Geom2d_Curve* or descendant) to be set.
@section occt_debug_vstudio Using Visual Studio debugger

File diff suppressed because it is too large Load Diff

View File

@@ -1,173 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="169.595"
height="115.66244"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="boolean_image001.svg">
<defs
id="defs4">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect2990"
height="17.998533"
width="17.278183"
y="14.642874"
x="3.1828232" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect2993"
height="18.151062"
width="17.429747"
y="17.388412"
x="54.86581" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="49.849591"
inkscape:cy="76.436836"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1042"
inkscape:window-height="640"
inkscape:window-x="18"
inkscape:window-y="263"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-99.629249,-395.59893)">
<g
id="g2995"
transform="matrix(2.2499232,0,0,2.2499232,101.67528,395.53094)">
<text
id="text2997"
style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="12.507455"
x="-0.90937805"
xml:space="preserve"> </text>
<path
id="path2999"
d="m 25.415222,0.49572229 c -13.84907,0 -25.07420523,11.29674871 -25.07420523,25.23417171 0,13.937423 11.22513523,25.234171 25.07420523,25.234171 13.84907,0 25.074205,-11.296748 25.074205,-25.234171 0,-13.937423 -11.225135,-25.23417171 -25.074205,-25.23417171"
style="fill:none;stroke:#000000;stroke-width:0.94726878px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3001"
d="m 24.941588,20.772671 c -2.491317,0 -4.518473,2.040088 -4.518473,4.547298 0,2.507211 2.027156,4.537766 4.518473,4.537766 2.491317,0 4.518472,-2.030555 4.518472,-4.537766 0,-2.50721 -2.027155,-4.547298 -4.518472,-4.547298"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3003"
d="m 24.941588,20.772671 c -2.491317,0 -4.518473,2.040088 -4.518473,4.547298 0,2.507211 2.027156,4.537766 4.518473,4.537766 2.491317,0 4.518472,-2.030555 4.518472,-4.537766 0,-2.50721 -2.027155,-4.547298 -4.518472,-4.547298"
style="fill:none;stroke:#000000;stroke-width:2.84180641px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text3005"
style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
y="27.60792"
x="3.1828232"
xml:space="preserve">V</text>
<text
id="text3007"
style="font-size:8.79065418px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
y="29.590809"
x="12.428167"
xml:space="preserve">1</text>
<text
id="text3009"
style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
y="27.60792"
x="17.429747"
xml:space="preserve"> </text>
<path
id="path3011"
d="m 50.11052,0.49572229 c -13.84907,0 -25.074206,11.29674871 -25.074206,25.23417171 0,13.937423 11.225136,25.234171 25.074206,25.234171 13.84907,0 25.064732,-11.296748 25.064732,-25.234171 0,-13.937423 -11.215662,-25.23417171 -25.064732,-25.23417171"
clip-path="url(#clipEmfPath1)"
style="fill:none;stroke:#000000;stroke-width:0.94726878px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3013"
d="m 49.636885,20.772671 c -2.491317,0 -4.518472,2.040088 -4.518472,4.547298 0,2.507211 2.027155,4.537766 4.518472,4.537766 2.491317,0 4.509,-2.030555 4.509,-4.537766 0,-2.50721 -2.017683,-4.547298 -4.509,-4.547298"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3015"
d="m 49.636885,20.772671 c -2.491317,0 -4.518472,2.040088 -4.518472,4.547298 0,2.507211 2.027155,4.537766 4.518472,4.537766 2.491317,0 4.509,-2.030555 4.509,-4.537766 0,-2.50721 -2.017683,-4.547298 -4.509,-4.547298"
style="fill:none;stroke:#000000;stroke-width:2.84180641px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text3017"
style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
y="30.353456"
x="54.86581"
xml:space="preserve">V</text>
<text
id="text3019"
style="font-size:8.79065418px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
y="32.336346"
x="64.111153"
xml:space="preserve">2</text>
<text
id="text3021"
style="font-size:13.94379711px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Arial"
y="30.353456"
x="69.112732"
xml:space="preserve"> </text>
<path
id="path2999-0"
d="m 48.910577,0.49552764 c -13.84907,0 -25.074205,11.29674836 -25.074205,25.23417136 0,13.937423 11.225135,25.234171 25.074205,25.234171 13.849066,0 25.074206,-11.296748 25.074206,-25.234171 0,-13.937423 -11.22514,-25.23417136 -25.074206,-25.23417136"
style="fill:none;stroke:#000000;stroke-width:0.94726878px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
sodipodi:type="arc"
style="fill:#ffffff;stroke:#ffffff;stroke-width:0.105;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path4048"
sodipodi:cx="28.721825"
sodipodi:cy="25.876774"
sodipodi:rx="3.368609"
sodipodi:ry="3.368609"
d="m 32.090434,25.876774 c 0,1.860431 -1.508178,3.368609 -3.368609,3.368609 -1.860432,0 -3.368609,-1.508178 -3.368609,-3.368609 0,-1.860432 1.508177,-3.368609 3.368609,-3.368609 1.860431,0 3.368609,1.508177 3.368609,3.368609 z"
transform="translate(-4.1006914,-0.50166522)" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 7.8 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 962 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 490 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

View File

@@ -1,210 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="194.92216"
height="180.60326"
id="svg5925"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 17">
<defs
id="defs5927">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5960"
height="189.81496"
width="566.85828"
y="0"
x="0" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5963"
height="15.905443"
width="26.550388"
y="34.661861"
x="70.801033" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5966"
height="15.755392"
width="26.70039"
y="89.88076"
x="143.8521" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.6743432"
inkscape:cx="56.701334"
inkscape:cy="90.302547"
inkscape:document-units="px"
inkscape:current-layer="g5968"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1099"
inkscape:window-height="774"
inkscape:window-x="132"
inkscape:window-y="132"
inkscape:window-maximized="0" />
<metadata
id="metadata5930">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-379.68462,-739.20433)">
<g
id="g5937" />
<g
id="g5948" />
<g
id="g5968"
transform="translate(355.90361,729.99263)">
<text
id="text5970"
style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="189.81496"
x="218.70319"
xml:space="preserve"> </text>
<path
id="path5972"
d="m 70.744783,34.624349 0,15.942956 26.681639,0 0,-15.942956 -26.681639,0 z"
clip-path="url(#clipEmfPath1)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text5974"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="46.365868"
x="77.851135"
xml:space="preserve">E</text>
<text
id="text5976"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="48.316532"
x="86.101257"
xml:space="preserve">2</text>
<text
id="text5978"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="46.365868"
x="90.301315"
xml:space="preserve"> </text>
<path
id="path5980"
d="m 143.87085,89.76822 0,15.88669 26.62539,0 0,-15.88669 -26.62539,0 z"
clip-path="url(#clipEmfPath2)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text5982"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="101.73481"
x="150.90221"
xml:space="preserve">E</text>
<text
id="text5984"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="103.68548"
x="159.15231"
xml:space="preserve">1</text>
<text
id="text5986"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="101.73481"
x="163.35239"
xml:space="preserve"> </text>
<path
id="path5988"
d="m 94.745133,16.993315 0,157.619565"
clip-path="url(#clipEmfPath3)"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5990"
d="m 94.145125,10.616133 c -1.950029,0 -3.525052,1.584917 -3.525052,3.535585 0,1.950667 1.575023,3.535585 3.525052,3.535585 1.959403,0 3.534426,-1.584918 3.534426,-3.535585 0,-1.950668 -1.575023,-3.535585 -3.534426,-3.535585"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5992"
d="m 94.145125,10.616133 c -1.950029,0 -3.525052,1.584917 -3.525052,3.535585 0,1.950667 1.575023,3.535585 3.525052,3.535585 1.959403,0 3.534426,-1.584918 3.534426,-3.535585 0,-1.950668 -1.575023,-3.535585 -3.534426,-3.535585"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5994"
d="m 94.52013,171.98698 c -1.950028,0 -3.525051,1.58492 -3.525051,3.53559 0,1.95066 1.575023,3.5262 3.525051,3.5262 1.959404,0 3.534427,-1.57554 3.534427,-3.5262 0,-1.95067 -1.575023,-3.53559 -3.534427,-3.53559"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5996"
d="m 94.52013,171.98698 c -1.950028,0 -3.525051,1.58492 -3.525051,3.53559 0,1.95066 1.575023,3.5262 3.525051,3.5262 1.959404,0 3.534427,-1.57554 3.534427,-3.5262 0,-1.95067 -1.575023,-3.53559 -3.534427,-3.53559"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5998"
d="M 31.491085,109.48122 188.99338,109.07795"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6000"
d="m 25.181618,110.16582 c 0,1.96943 1.584398,3.55435 3.534426,3.55435 1.950029,-0.009 3.534427,-1.60368 3.525052,-3.5731 0,-1.96943 -1.584398,-3.56372 -3.534427,-3.55434 -1.959403,0 -3.534426,1.60367 -3.525051,3.57309"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6002"
d="m 25.181618,110.16582 c 0,1.96943 1.584398,3.55435 3.534426,3.55435 1.950029,-0.009 3.534427,-1.60368 3.525052,-3.5731 0,-1.96943 -1.584398,-3.56372 -3.534427,-3.55434 -1.959403,0 -3.534426,1.60367 -3.525051,3.57309"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6004"
d="m 186.36835,109.34992 c 0.009,1.96942 1.59377,3.56372 3.5438,3.55434 1.95003,0 3.52505,-1.60367 3.51567,-3.5731 0,-1.96942 -1.58439,-3.55434 -3.53442,-3.55434 -1.95003,0.009 -3.52505,1.60368 -3.52505,3.5731"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6006"
d="m 186.36835,109.34992 c 0.009,1.96942 1.59377,3.56372 3.5438,3.55434 1.95003,0 3.52505,-1.60367 3.51567,-3.5731 0,-1.96942 -1.58439,-3.55434 -3.53442,-3.55434 -1.95003,0.009 -3.52505,1.60368 -3.52505,3.5731"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 70.297635,8.9723282 0,153.3086718"
id="path6038"
inkscape:connector-curvature="0"
transform="translate(379.68462,739.20433)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 9.1 KiB

View File

@@ -1,322 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="187.048"
height="184.22337"
id="svg6570"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 24">
<defs
id="defs6572">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6583"
height="189.81496"
width="566.85828"
y="0"
x="0" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6586"
height="16.055494"
width="26.550388"
y="110.13769"
x="111.30163" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6589"
height="15.905443"
width="26.70039"
y="148.85094"
x="77.101128" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6592"
height="15.905443"
width="26.70039"
y="86.579628"
x="47.100689" />
</clipPath>
<clipPath
id="clipEmfPath5"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6595"
height="15.755392"
width="26.550388"
y="86.279526"
x="151.80222" />
</clipPath>
<clipPath
id="clipEmfPath6"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6598"
height="15.905443"
width="26.70039"
y="32.561142"
x="71.851051" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.817206"
inkscape:cx="35.662879"
inkscape:cy="92.112538"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1132"
inkscape:window-height="778"
inkscape:window-x="110"
inkscape:window-y="110"
inkscape:window-maximized="0" />
<metadata
id="metadata6575">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(76.37877,-320.25135)">
<g
id="g6600"
transform="translate(-108.03395,314.65977)">
<text
id="text6602"
style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="189.81496"
x="218.70319"
xml:space="preserve"> </text>
<path
id="path6604"
d="m 111.24537,110.15645 0,15.99922 26.62539,0 0,-15.99922 -26.62539,0 z"
clip-path="url(#clipEmfPath1)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text6606"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="121.8417"
x="114.60167"
xml:space="preserve">Vn</text>
<text
id="text6608"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="123.79236"
x="130.50191"
xml:space="preserve">1</text>
<text
id="text6610"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="121.8417"
x="134.70197"
xml:space="preserve"> </text>
<path
id="path6612"
d="m 77.119876,148.85094 0,15.88668 26.625384,0 0,-15.88668 -26.625384,0 z"
clip-path="url(#clipEmfPath2)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text6614"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="160.55495"
x="82.201202"
xml:space="preserve">E</text>
<text
id="text6616"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="162.50562"
x="90.451324"
xml:space="preserve">21</text>
<text
id="text6618"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="160.55495"
x="98.701439"
xml:space="preserve"> </text>
<path
id="path6620"
d="m 47.119438,86.523359 0,15.942961 26.625389,0 0,-15.942961 -26.625389,0 z"
clip-path="url(#clipEmfPath3)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text6622"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.28363"
x="52.200764"
xml:space="preserve">E</text>
<text
id="text6624"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="100.2343"
x="60.450882"
xml:space="preserve">11</text>
<text
id="text6626"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.28363"
x="68.701004"
xml:space="preserve"> </text>
<path
id="path6628"
d="m 151.74597,86.148231 0,15.877309 26.62538,0 0,-15.877309 -26.62538,0 z"
clip-path="url(#clipEmfPath4)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text6630"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.133583"
x="156.90228"
xml:space="preserve">E</text>
<text
id="text6632"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="100.08425"
x="165.1524"
xml:space="preserve">12</text>
<text
id="text6634"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.133583"
x="173.40253"
xml:space="preserve"> </text>
<path
id="path6636"
d="m 71.869799,32.504874 0,15.942955 26.625389,0 0,-15.942955 -26.625389,0 z"
clip-path="url(#clipEmfPath5)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text6638"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.265148"
x="76.951126"
xml:space="preserve">E</text>
<text
id="text6640"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="46.215816"
x="85.201241"
xml:space="preserve">22</text>
<text
id="text6642"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.265148"
x="93.451363"
xml:space="preserve"> </text>
<path
id="path6644"
d="m 102.62025,13.373326 0,157.553914"
clip-path="url(#clipEmfPath6)"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6646"
d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6648"
d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6650"
d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6652"
d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6654"
d="m 39.3662,105.9175 157.5023,-0.40327"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6656"
d="m 33.056733,106.53646 c 0,1.93191 1.584398,3.49807 3.534426,3.48869 1.950029,0 3.534427,-1.57554 3.525052,-3.50745 0,-1.93191 -1.584398,-3.49807 -3.534427,-3.48869 -1.959403,0 -3.534426,1.57554 -3.525051,3.50745"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6658"
d="m 33.056733,106.53646 c 0,1.93191 1.584398,3.49807 3.534426,3.48869 1.950029,0 3.534427,-1.57554 3.525052,-3.50745 0,-1.93191 -1.584398,-3.49807 -3.534427,-3.48869 -1.959403,0 -3.534426,1.57554 -3.525051,3.50745"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6660"
d="m 194.24346,105.72055 c 0.009,1.94129 1.59377,3.49808 3.5438,3.49808 1.95003,-0.009 3.52505,-1.57554 3.51568,-3.50745 0,-1.94129 -1.5844,-3.49808 -3.53443,-3.49808 -1.95003,0.009 -3.52505,1.57554 -3.52505,3.50745"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6662"
d="m 194.24346,105.72055 c 0.009,1.94129 1.59377,3.49808 3.5438,3.49808 1.95003,-0.009 3.52505,-1.57554 3.51568,-3.50745 0,-1.94129 -1.5844,-3.49808 -3.53443,-3.49808 -1.95003,0.009 -3.52505,1.57554 -3.52505,3.50745"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6664"
d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6666"
d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m -5.7414067,329.12368 0,86.61064"
id="path6720"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m -6.096368,423.89843 0.354961,59.98852"
id="path6722"
inkscape:connector-curvature="0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -1,231 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="187.048"
height="75.616943"
id="svg7232"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 27">
<defs
id="defs7234">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7245"
height="165.50787"
width="566.85828"
y="0"
x="0" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7248"
height="16.055614"
width="26.550388"
y="110.13851"
x="111.30163" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7251"
height="15.905562"
width="26.70039"
y="86.580276"
x="47.100689" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7254"
height="15.755509"
width="26.550388"
y="86.280167"
x="151.80222" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.9400647"
inkscape:cx="52.151745"
inkscape:cy="37.80847"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="901"
inkscape:window-height="660"
inkscape:window-x="176"
inkscape:window-y="176"
inkscape:window-maximized="0" />
<metadata
id="metadata7237">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(42.093052,-363.12514)">
<g
id="g7256"
transform="translate(-73.748232,273.23421)">
<text
id="text7258"
style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="165.50787"
x="218.70319"
xml:space="preserve"> </text>
<path
id="path7260"
d="m 111.24537,110.15727 0,16.06499 26.62539,0 0,-16.06499 -26.62539,0 z"
clip-path="url(#clipEmfPath1)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text7262"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="121.8426"
x="114.60167"
xml:space="preserve">Vn</text>
<text
id="text7264"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="123.79329"
x="130.50191"
xml:space="preserve">1</text>
<text
id="text7266"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="121.8426"
x="134.70197"
xml:space="preserve"> </text>
<path
id="path7268"
d="m 47.119438,86.524005 0,15.943075 26.625389,0 0,-15.943075 -26.625389,0 z"
clip-path="url(#clipEmfPath2)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text7270"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.28437"
x="52.200764"
xml:space="preserve">E</text>
<text
id="text7272"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="100.23505"
x="60.450882"
xml:space="preserve">11</text>
<text
id="text7274"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.28437"
x="68.701004"
xml:space="preserve"> </text>
<path
id="path7276"
d="m 151.74597,86.148874 0,15.877426 26.62538,0 0,-15.877426 -26.62538,0 z"
clip-path="url(#clipEmfPath3)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text7278"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.134315"
x="156.90228"
xml:space="preserve">E</text>
<text
id="text7280"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="100.085"
x="165.1524"
xml:space="preserve">12</text>
<text
id="text7282"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="98.134315"
x="173.40253"
xml:space="preserve"> </text>
<path
id="path7284"
d="m 39.3662,105.97456 157.5023,-0.39389"
clip-path="url(#clipEmfPath4)"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path7286"
d="m 33.056733,106.56539 c 0,1.95068 1.584398,3.53561 3.534426,3.52623 1.950029,0 3.534427,-1.58493 3.525052,-3.53561 0,-1.96006 -1.584398,-3.53561 -3.534427,-3.52623 -1.959403,0 -3.534426,1.58493 -3.525051,3.53561"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path7288"
d="m 33.056733,106.56539 c 0,1.95068 1.584398,3.53561 3.534426,3.52623 1.950029,0 3.534427,-1.58493 3.525052,-3.53561 0,-1.96006 -1.584398,-3.53561 -3.534427,-3.52623 -1.959403,0 -3.534426,1.58493 -3.525051,3.53561"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path7290"
d="m 194.24346,105.75886 c 0.009,1.95068 1.59377,3.52623 3.5438,3.51685 1.95003,0 3.52505,-1.58493 3.51568,-3.53561 0,-1.95068 -1.5844,-3.52623 -3.53443,-3.52623 -1.95003,0.009 -3.52505,1.5943 -3.52505,3.54499"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path7292"
d="m 194.24346,105.75886 c 0.009,1.95068 1.59377,3.52623 3.5438,3.51685 1.95003,0 3.52505,-1.58493 3.51568,-3.53561 0,-1.95068 -1.5844,-3.52623 -3.53443,-3.52623 -1.95003,0.009 -3.52505,1.5943 -3.52505,3.54499"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path7294"
d="m 102.46087,101.58552 c -1.95003,0 -3.534426,1.58493 -3.534426,3.53561 0,1.95069 1.584396,3.53561 3.534426,3.53561 1.95003,0 3.53443,-1.58492 3.53443,-3.53561 0,-1.95068 -1.5844,-3.53561 -3.53443,-3.53561"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path7296"
d="m 102.46087,101.58552 c -1.95003,0 -3.534426,1.58493 -3.534426,3.53561 0,1.95069 1.584396,3.53561 3.534426,3.53561 1.95003,0 3.53443,-1.58492 3.53443,-3.53561 0,-1.95068 -1.5844,-3.53561 -3.53443,-3.53561"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="M 8.121694,16.480859 67.257779,15.973253"
id="path7331"
inkscape:connector-curvature="0"
transform="translate(-42.093052,363.12514)" />
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="M 74.110458,15.71945 162.43388,14.958041"
id="path7333"
inkscape:connector-curvature="0"
transform="translate(-42.093052,363.12514)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 9.5 KiB

View File

@@ -1,231 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="141.50281"
height="184.22337"
id="svg7843"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 30">
<defs
id="defs7845">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7856"
height="189.81496"
width="566.85828"
y="0"
x="0" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7859"
height="16.055494"
width="26.550388"
y="110.13769"
x="111.30163" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7862"
height="15.905443"
width="26.70039"
y="148.85094"
x="77.101128" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect7865"
height="15.905443"
width="26.70039"
y="32.561142"
x="71.851051" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.3178168"
inkscape:cx="0.42660899"
inkscape:cy="92.112538"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="902"
inkscape:window-height="840"
inkscape:window-x="223"
inkscape:window-y="76"
inkscape:window-maximized="0" />
<metadata
id="metadata7848">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-43.534308,-323.10849)">
<g
id="g7867"
transform="translate(-33.666065,317.51691)">
<text
id="text7869"
style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="189.81496"
x="218.70319"
xml:space="preserve"> </text>
<path
id="path7871"
d="m 111.30163,110.15645 0,15.99922 26.62538,0 0,-15.99922 -26.62538,0 z"
clip-path="url(#clipEmfPath1)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text7873"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="121.8417"
x="114.60167"
xml:space="preserve">Vn</text>
<text
id="text7875"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="123.79236"
x="130.50191"
xml:space="preserve">1</text>
<text
id="text7877"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="121.8417"
x="134.70197"
xml:space="preserve"> </text>
<path
id="path7879"
d="m 77.119876,148.85094 0,15.88668 26.625384,0 0,-15.88668 -26.625384,0 z"
clip-path="url(#clipEmfPath2)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text7881"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="160.55495"
x="82.201202"
xml:space="preserve">E</text>
<text
id="text7883"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="162.50562"
x="90.451324"
xml:space="preserve">21</text>
<text
id="text7885"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="160.55495"
x="98.701439"
xml:space="preserve"> </text>
<path
id="path7887"
d="m 71.869799,32.504874 0,15.942955 26.625389,0 0,-15.942955 -26.625389,0 z"
clip-path="url(#clipEmfPath3)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text7889"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.265148"
x="76.951126"
xml:space="preserve">E</text>
<text
id="text7891"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="46.215816"
x="85.201241"
xml:space="preserve">22</text>
<text
id="text7893"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.265148"
x="93.451363"
xml:space="preserve"> </text>
<path
id="path7895"
d="m 102.62025,13.373326 0,157.553914"
clip-path="url(#clipEmfPath4)"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path7897"
d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path7899"
d="m 102.02024,6.9961442 c -1.95003,0 -3.525052,1.5755391 -3.525052,3.5262068 0,1.960046 1.575022,3.535585 3.525052,3.535585 1.9594,0 3.53443,-1.575539 3.53443,-3.535585 0,-1.9506677 -1.57503,-3.5262068 -3.53443,-3.5262068"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path7901"
d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path7903"
d="m 102.39525,168.30134 c -1.95003,0 -3.525056,1.57554 -3.525056,3.52621 0,1.96005 1.575026,3.53559 3.525056,3.53559 1.9594,0 3.53442,-1.57554 3.53442,-3.53559 0,-1.95067 -1.57502,-3.52621 -3.53442,-3.52621"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path7905"
d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path7907"
d="m 102.46087,101.58476 c -1.95003,0 -3.534426,1.58492 -3.534426,3.53559 0,1.95067 1.584396,3.53558 3.534426,3.53558 1.95003,0 3.53443,-1.58491 3.53443,-3.53558 0,-1.95067 -1.5844,-3.53559 -3.53443,-3.53559"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 25.023548,8.6271 0,86.288095"
id="path7946"
inkscape:connector-curvature="0"
transform="translate(43.534308,323.10849)" />
<path
style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 25.454988,104.40689 0,57.38158"
id="path7948"
inkscape:connector-curvature="0"
transform="translate(43.534308,323.10849)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 9.5 KiB

View File

@@ -1,205 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="204.41466"
height="137.59633"
id="svg8458"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 33">
<defs
id="defs8460">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect8471"
height="169.12204"
width="566.85828"
y="0"
x="0" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect8474"
height="15.742743"
width="26.70039"
y="140.93503"
x="159.60233" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect8477"
height="15.892674"
width="26.550388"
y="32.834866"
x="39.450577" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.5176879"
inkscape:cx="102.20076"
inkscape:cy="68.79519"
inkscape:document-units="px"
inkscape:current-layer="g8479"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1015"
inkscape:window-height="672"
inkscape:window-x="44"
inkscape:window-y="44"
inkscape:window-maximized="0" />
<metadata
id="metadata8463">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(70.772185,-349.27533)">
<g
id="g8479"
transform="translate(-84.492153,318.18383)">
<text
id="text8481"
style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="168.97211"
x="218.70319"
xml:space="preserve"> </text>
<path
id="path8483"
d="m 159.55545,140.80384 0,15.93016 26.69102,0 0,-15.93016 -26.69102,0 z"
clip-path="url(#clipEmfPath1)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text8485"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="152.77957"
x="166.65244"
xml:space="preserve">E</text>
<text
id="text8487"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="154.72867"
x="174.90256"
xml:space="preserve">2</text>
<text
id="text8489"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="152.77957"
x="179.10262"
xml:space="preserve"> </text>
<path
id="path8491"
d="m 39.431826,32.788011 0,15.864562 26.625388,0 0,-15.864562 -26.625388,0 z"
clip-path="url(#clipEmfPath2)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text8493"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.529472"
x="46.500679"
xml:space="preserve">E</text>
<text
id="text8495"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="46.478577"
x="54.750797"
xml:space="preserve">1</text>
<text
id="text8497"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.529472"
x="58.950863"
xml:space="preserve"> </text>
<path
id="path8499"
d="M 153.30224,120.70373 19.865915,36.957963"
clip-path="url(#clipEmfPath3)"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path8501"
d="m 159.0117,123.5899 c 1.04064,-1.64924 0.54375,-3.82323 -1.10627,-4.86338 -1.65002,-1.03077 -3.83443,-0.53413 -4.87507,1.11511 -1.03127,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65002,1.04015 3.83443,0.5435 4.8657,-1.11511"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path8503"
d="m 160.71736,119.32574 c 1.04064,-1.64924 0.54375,-3.82323 -1.10627,-4.86338 -1.65002,-1.03077 -3.83443,-0.53413 -4.87507,1.11511 -1.03127,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65002,1.04015 3.83443,0.5435 4.8657,-1.11511"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path8505"
d="m 22.200324,38.194893 c 1.04064,-1.649239 0.543758,-3.832608 -1.115641,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650024,1.030775 3.834431,0.534129 4.865696,-1.115111"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path8507"
d="m 22.200324,38.194893 c 1.04064,-1.649239 0.543758,-3.832608 -1.115641,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650024,1.030775 3.834431,0.534129 4.865696,-1.115111"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path8509"
d="M 198.14946,149.63913 61.644959,70.993542"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path8511"
d="m 202.32483,155.07539 c 1.04064,-1.64924 0.54376,-3.82324 -1.10627,-4.86338 -1.65002,-1.03078 -3.83443,-0.53413 -4.87507,1.11511 -1.03126,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65003,1.04015 3.83443,0.5435 4.8657,-1.11511"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path8513"
d="m 204.88333,153.93828 c 1.04064,-1.64924 0.54376,-3.82324 -1.10627,-4.86338 -1.65002,-1.03078 -3.83443,-0.53413 -4.87507,1.11511 -1.03126,1.64924 -0.53438,3.83261 1.11564,4.86338 1.65003,1.04015 3.83443,0.5435 4.8657,-1.11511"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path8515"
d="m 65.513457,69.680379 c 1.04064,-1.649239 0.543757,-3.832608 -1.115642,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650025,1.030775 3.834431,0.534129 4.865697,-1.115111"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path8517"
d="m 62.670681,70.533212 c 1.04064,-1.649239 0.543757,-3.832608 -1.115642,-4.863383 -1.650024,-1.040145 -3.825056,-0.543499 -4.865696,1.115111 -1.031265,1.64924 -0.534383,3.823238 1.115641,4.863383 1.650025,1.030775 3.834431,0.534129 4.865697,-1.115111"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="M -63.096689,357.24106 69.31399,433.6884"
id="path8549"
inkscape:connector-curvature="0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -1,250 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="204.66461"
height="131.16034"
id="svg9059"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 36">
<defs
id="defs9061">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect9072"
height="162.56694"
width="566.85828"
y="0"
x="0" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect9075"
height="15.746798"
width="26.70039"
y="74.08493"
x="98.85144" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect9078"
height="15.746798"
width="26.70039"
y="140.97133"
x="159.30232" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect9081"
height="15.896767"
width="26.550388"
y="32.843323"
x="39.300575" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.1865399"
inkscape:cx="91.411912"
inkscape:cy="65.588382"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="861"
inkscape:window-height="606"
inkscape:window-x="110"
inkscape:window-y="110"
inkscape:window-maximized="0" />
<metadata
id="metadata9064">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(56.60986,-329.64737)">
<g
id="g9083"
transform="translate(-70.64843,298.24077)">
<text
id="text9085"
style="font-size:12.45018196px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="162.56694"
x="218.70319"
xml:space="preserve"> </text>
<path
id="path9087"
d="m 98.870194,73.972457 0,15.878021 26.625386,0 0,-15.878021 -26.625386,0 z"
clip-path="url(#clipEmfPath1)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text9089"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="85.932526"
x="103.95152"
xml:space="preserve">E</text>
<text
id="text9091"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="87.882126"
x="112.20164"
xml:space="preserve">12</text>
<text
id="text9093"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="85.932526"
x="120.45176"
xml:space="preserve"> </text>
<path
id="path9095"
d="m 159.30233,140.84011 0,15.93426 26.69101,0 0,-15.93426 -26.69101,0 z"
clip-path="url(#clipEmfPath2)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text9097"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="152.81892"
x="164.4024"
xml:space="preserve">E</text>
<text
id="text9099"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="154.76852"
x="172.65253"
xml:space="preserve">22</text>
<text
id="text9101"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="152.81892"
x="180.90263"
xml:space="preserve"> </text>
<path
id="path9103"
d="m 39.178697,32.796455 0,15.868648 26.625389,0 0,-15.868648 -26.625389,0 z"
clip-path="url(#clipEmfPath3)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text9105"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.540943"
x="44.400646"
xml:space="preserve">E</text>
<text
id="text9107"
style="font-size:8.10011864px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="46.490547"
x="52.650768"
xml:space="preserve">11</text>
<text
id="text9109"
style="font-size:12.45018196px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Times New Roman"
y="44.540943"
x="60.90089"
xml:space="preserve"> </text>
<path
id="path9111"
d="M 196.93413,148.29172 63.488427,64.524378"
clip-path="url(#clipEmfPath4)"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path9113"
d="m 202.64358,151.17863 c 1.03127,-1.64966 0.53439,-3.82422 -1.11564,-4.86463 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.11539 -1.04064,1.64967 -0.54376,3.8336 1.11564,4.86464 1.65002,1.04041 3.82505,0.54364 4.86569,-1.1154"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path9115"
d="m 202.64358,151.17863 c 1.03127,-1.64966 0.53439,-3.82422 -1.11564,-4.86463 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.11539 -1.04064,1.64967 -0.54376,3.8336 1.11564,4.86464 1.65002,1.04041 3.82505,0.54364 4.86569,-1.1154"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path9117"
d="m 65.822836,65.761627 c 1.04064,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.543639 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path9119"
d="m 65.822836,65.761627 c 1.04064,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.543639 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path9121"
d="M 153.05848,120.73482 19.612786,36.967482"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path9123"
d="m 158.76794,123.62174 c 1.03127,-1.64967 0.53439,-3.82423 -1.11564,-4.86464 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.1154 -1.04064,1.64966 -0.54376,3.83359 1.11564,4.86463 1.65002,1.04042 3.82505,0.54364 4.86569,-1.11539"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path9125"
d="m 158.76794,123.62174 c 1.03127,-1.64967 0.53439,-3.82423 -1.11564,-4.86464 -1.65002,-1.03104 -3.83443,-0.53427 -4.86569,1.1154 -1.04064,1.64966 -0.54376,3.83359 1.11564,4.86463 1.65002,1.04042 3.82505,0.54364 4.86569,-1.11539"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path9127"
d="m 21.947195,38.204731 c 1.040641,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.54364 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path9129"
d="m 21.947195,38.204731 c 1.040641,-1.649665 0.543758,-3.833596 -1.106266,-4.864636 -1.650024,-1.040413 -3.834431,-0.54364 -4.875071,1.115398 -1.031265,1.649665 -0.534383,3.824222 1.115641,4.864636 1.650024,1.03104 3.834431,0.534266 4.865696,-1.115398"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path9131"
d="m 59.307116,63.9245 c 0,1.96835 1.584398,3.561776 3.534427,3.552403 1.950028,0 3.534426,-1.602799 3.525051,-3.571149 0,-1.96835 -1.584398,-3.552402 -3.534427,-3.552402 -1.959403,0.0094 -3.534426,1.602799 -3.525051,3.571148"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path9133"
d="m 59.307116,63.9245 c 0,1.96835 1.584398,3.561776 3.534427,3.552403 1.950028,0 3.534426,-1.602799 3.525051,-3.571149 0,-1.96835 -1.584398,-3.552402 -3.534427,-3.552402 -1.959403,0.0094 -3.534426,1.602799 -3.525051,3.571148"
style="fill:none;stroke:#000000;stroke-width:2.81254101px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 144.67103,92.560478 37.97222,22.908862"
id="path9173"
inkscape:connector-curvature="0"
transform="translate(-56.60986,329.64737)" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 15 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 15 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 933 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -1,274 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="505.00238"
height="235.7374"
id="svg3301"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 8">
<defs
id="defs3303">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3314"
height="22.583204"
width="33.706238"
y="12.49604"
x="23.173038" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3317"
height="22.583204"
width="33.856712"
y="193.16167"
x="176.50632" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3320"
height="22.583204"
width="33.706238"
y="12.49604"
x="316.59787" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3323"
height="22.583204"
width="33.856712"
y="193.16167"
x="469.93115" />
</clipPath>
<clipPath
id="clipEmfPath5"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3326"
height="22.583204"
width="33.856712"
y="97.258331"
x="382.35513" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="361.78155"
inkscape:cy="-19.268066"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="467"
inkscape:window-height="424"
inkscape:window-x="512"
inkscape:window-y="345"
inkscape:window-maximized="0" />
<metadata
id="metadata3306">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-13.218455,-277.35672)">
<g
id="g3328"
transform="translate(13.970826,277.32547)">
<text
id="text3330"
style="font-size:13.84363365px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="235.76865"
x="-0.75237137"
xml:space="preserve"> </text>
<path
id="path3332"
d="m 68.146037,80.208013 0,142.274187 142.198193,0 0,-142.274187 -142.198193,0 z"
style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3334"
d="m 68.146037,80.208013 0,142.274187 142.198193,0 0,-142.274187 z"
style="fill:none;stroke:#000000;stroke-width:0.9404642px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3336"
d="m 0.43261354,1.1667989 0,142.2741811 142.19818646,0 0,-142.2741811 z"
style="fill:none;stroke:#000000;stroke-width:0.9404642px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text3338"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="25.594297"
x="23.173038"
xml:space="preserve">S</text>
<text
id="text3340"
style="font-size:8.72750759px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="27.55151"
x="29.643433"
xml:space="preserve">1</text>
<text
id="text3342"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="25.594297"
x="34.157661"
xml:space="preserve"> </text>
<text
id="text3344"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="206.25993"
x="176.50632"
xml:space="preserve">S</text>
<text
id="text3346"
style="font-size:8.72750759px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="208.21713"
x="182.97672"
xml:space="preserve">2</text>
<text
id="text3348"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="206.25993"
x="187.49095"
xml:space="preserve"> </text>
<path
id="path3350"
d="m 361.57087,79.586975 0,142.274185 142.19819,0 0,-142.274185 -142.19819,0 z"
clip-path="url(#clipEmfPath2)"
style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3352"
d="m 361.57087,79.586975 0,142.274185 142.19819,0 0,-142.274185 z"
style="fill:none;stroke:#000000;stroke-width:0.9404642px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3354"
d="m 361.57087,80.28329 0,142.27418 142.19819,0 0,-142.27418 -142.19819,0 z"
style="fill:#c0c0c0;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3356"
d="m 361.57087,80.28329 0,142.27418 142.19819,0 0,-142.27418 z"
style="fill:none;stroke:#000000;stroke-width:0.9404642px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3358"
d="m 293.85745,1.1667989 0,142.2741811 142.19819,0 0,-142.2741811 z"
style="fill:none;stroke:#000000;stroke-width:0.9404642px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text3360"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="25.594297"
x="316.59787"
xml:space="preserve">S</text>
<text
id="text3362"
style="font-size:8.72750759px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="27.55151"
x="323.06827"
xml:space="preserve">p1</text>
<text
id="text3364"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="25.594297"
x="332.24719"
xml:space="preserve"> </text>
<text
id="text3366"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="206.25993"
x="469.93115"
xml:space="preserve">S</text>
<text
id="text3368"
style="font-size:8.72750759px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="208.21713"
x="476.40155"
xml:space="preserve">p2</text>
<text
id="text3370"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="206.25993"
x="485.58047"
xml:space="preserve"> </text>
<path
id="path3372"
d="m 361.57087,80.28329 0,63.28943 74.48477,0 0,-63.28943 -74.48477,0 z"
clip-path="url(#clipEmfPath4)"
style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3374"
d="m 361.57087,80.28329 0,63.28943 74.48477,0 0,-63.28943 z"
style="fill:none;stroke:#000000;stroke-width:1.8809284px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3376"
d="m 293.85745,0.48930275 0,142.27418725 142.19819,0 0,-142.27418725 z"
style="fill:none;stroke:#000000;stroke-width:0.9404642px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text3378"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="110.35659"
x="382.35513"
xml:space="preserve">S</text>
<text
id="text3380"
style="font-size:8.72750759px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="112.3138"
x="388.82553"
xml:space="preserve">p12</text>
<text
id="text3382"
style="font-size:13.84363365px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="110.35659"
x="402.51868"
xml:space="preserve"> </text>
<path
id="path3384"
d="m 237.80578,95.018831 26.333,0 0,1.251486 -26.333,0 0,-1.251486 z m 0,2.502971 26.333,0 0,1.260896 -26.333,0 0,-1.260896 z m 24.45207,-6.266839 11.28557,5.645801 -11.28557,5.645806 0,-11.291607 z"
clip-path="url(#clipEmfPath5)"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15047428px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -1,591 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="440.74124"
height="141.61459"
id="svg3429"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 10">
<defs
id="defs3431">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3442"
height="15.393243"
width="48.765743"
y="43.312359"
x="153.64961" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3445"
height="15.393243"
width="46.515018"
y="39.539505"
x="-0.15004845" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3448"
height="15.393243"
width="13.654409"
y="65.949478"
x="50.566326" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3451"
height="15.393243"
width="13.804457"
y="67.005882"
x="124.24011" />
</clipPath>
<clipPath
id="clipEmfPath5"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3454"
height="15.393243"
width="12.604069"
y="20.222494"
x="97.681541" />
</clipPath>
<clipPath
id="clipEmfPath6"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3457"
height="10.865818"
width="6.7521801"
y="25.50449"
x="105.33401" />
</clipPath>
<clipPath
id="clipEmfPath7"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3460"
height="18.260611"
width="16.955475"
y="70.175079"
x="99.182022" />
</clipPath>
<clipPath
id="clipEmfPath8"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3463"
height="13.582273"
width="8.8528585"
y="76.06073"
x="109.83546" />
</clipPath>
<clipPath
id="clipEmfPath9"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3466"
height="15.393243"
width="13.804457"
y="108.05453"
x="134.29337" />
</clipPath>
<clipPath
id="clipEmfPath10"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3469"
height="15.393243"
width="45.914825"
y="0"
x="400.1792" />
</clipPath>
<clipPath
id="clipEmfPath11"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3472"
height="18.411526"
width="27.458866"
y="71.382393"
x="372.2702" />
</clipPath>
<clipPath
id="clipEmfPath12"
clipPathUnits="userSpaceOnUse">
<rect
id="rect3475"
height="18.411526"
width="18.606007"
y="52.518124"
x="378.12207" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="200.70257"
inkscape:cy="-60.62128"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="822"
inkscape:window-height="658"
inkscape:window-x="110"
inkscape:window-y="110"
inkscape:window-maximized="0" />
<metadata
id="metadata3434">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(211.79919,-330.12631)">
<g
id="g3477"
transform="translate(-211.75025,326.56149)">
<text
id="text3479"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="145.17941"
x="0.15004845"
xml:space="preserve"> </text>
<path
id="path3481"
d="m 71.601243,38.615157 c -15.229917,0 -27.571402,11.705278 -27.571402,26.155307 0,14.45003 12.341485,26.155308 27.571402,26.155308 15.229917,0 27.571402,-11.705278 27.571402,-26.155308 0,-14.450029 -12.341485,-26.155307 -27.571402,-26.155307"
style="fill:none;stroke:#000000;stroke-width:0.87215662px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3483"
d="m 118.51952,36.474062 c -18.89673,0 -34.229805,14.129337 -34.229805,31.569353 0,17.430583 15.333075,31.55992 34.229805,31.55992 18.9061,0 34.2298,-14.129337 34.2298,-31.55992 0,-17.440016 -15.3237,-31.569353 -34.2298,-31.569353"
style="fill:none;stroke:#000000;stroke-width:0.87215662px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3485"
d="m 117.99435,61.629564 c -1.69743,0 -3.06662,1.556302 -3.06662,3.489889 0,1.924156 1.36919,3.48989 3.06662,3.48989 1.68804,0 3.05723,-1.565734 3.05723,-3.48989 0,-1.933587 -1.36919,-3.489889 -3.05723,-3.489889"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3487"
d="m 117.99435,61.629564 c -1.69743,0 -3.06662,1.556302 -3.06662,3.489889 0,1.924156 1.36919,3.48989 3.06662,3.48989 1.68804,0 3.05723,-1.565734 3.05723,-3.48989 0,-1.933587 -1.36919,-3.489889 -3.05723,-3.489889"
style="fill:none;stroke:#000000;stroke-width:1.80995941px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3489"
d="m 70.447746,61.629564 c -1.678667,0 -3.038481,1.556302 -3.038481,3.489889 0,1.924156 1.359814,3.48989 3.038481,3.48989 1.669289,0 3.029103,-1.565734 3.029103,-3.48989 0,-1.933587 -1.359814,-3.489889 -3.029103,-3.489889"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3491"
d="m 70.447746,61.629564 c -1.678667,0 -3.038481,1.556302 -3.038481,3.489889 0,1.924156 1.359814,3.48989 3.038481,3.48989 1.669289,0 3.029103,-1.565734 3.029103,-3.48989 0,-1.933587 -1.359814,-3.489889 -3.029103,-3.489889"
style="fill:none;stroke:#000000;stroke-width:1.80995941px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3493"
d="M 121.61427,63.572583 140.18276,58.16797"
style="fill:none;stroke:#000000;stroke-width:0.87215662px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3495"
d="m 141.46755,62.318109 7.66185,-6.885457 -10.63468,-1.348796 2.97283,8.234253 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3497"
d="M 65.974426,62.884038 54.533232,56.404161"
style="fill:none;stroke:#000000;stroke-width:0.87215662px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3499"
d="m 57.468555,52.857679 -10.812866,-0.792299 5.626817,8.243685 5.186049,-7.451386 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3501"
d="m 70.410233,68.986628 0.06565,62.940632"
style="fill:none;stroke:#000000;stroke-width:0.30947492px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3503"
d="m 117.9287,68.28865 0.0656,62.25208"
style="fill:none;stroke:#000000;stroke-width:0.30947492px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3505"
d="m 79.788261,123.12708 28.012169,0.18864"
style="fill:none;stroke:#000000;stroke-width:0.30947492px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3507"
d="m 80.107114,118.65625 -9.696881,4.4614 9.696881,4.34821 0,-8.80961 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3509"
d="m 107.49096,127.77712 9.6875,-4.4614 -9.6875,-4.33878 0,8.80018 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3511"
d="m 96.143542,62.318109 c -1.922496,0 -3.46987,1.433685 -3.46987,3.206926 0,1.773241 1.547374,3.206926 3.46987,3.206926 1.913118,0 3.46987,-1.433685 3.46987,-3.206926 0,-1.773241 -1.556752,-3.206926 -3.46987,-3.206926"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3513"
d="m 96.143542,62.318109 c -1.922496,0 -3.46987,1.433685 -3.46987,3.206926 0,1.773241 1.547374,3.206926 3.46987,3.206926 1.913118,0 3.46987,-1.433685 3.46987,-3.206926 0,-1.773241 -1.556752,-3.206926 -3.46987,-3.206926"
style="fill:none;stroke:#000000;stroke-width:1.80995941px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3515"
d="m 98.703744,14.280251 c -29.990934,0 -54.298782,23.212482 -54.298782,51.839008 0,28.635959 24.307848,51.848441 54.298782,51.848441 29.990936,0 54.298786,-23.212482 54.298786,-51.848441 0,-28.626526 -24.30785,-51.839008 -54.298786,-51.839008"
style="fill:none;stroke:#000000;stroke-width:0.87215662px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3517"
d="m 117.9287,123.12708 43.07328,0.18864"
style="fill:none;stroke:#000000;stroke-width:0.30947492px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3519"
d="m 75.727575,64.515797 -0.121914,0 -0.187561,0.113185 -0.131292,0.160347 -0.187561,0.103753 0.187561,0.113186 0.131292,0.160346 0.187561,0.103753 0.121914,-0.103753 0.121915,-0.160346 0.18756,-0.113186 -0.18756,-0.103753 -0.121915,-0.160347 0,-0.113185 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3521"
d="m 77.349974,64.515797 -0.121914,0 -0.121915,0.113185 -0.18756,0.160347 0,0.103753 0,0.113186 0,0.160346 0.18756,0.103753 0.121915,0 0.121914,0 0.187561,-0.103753 0.131292,-0.160346 0.187561,-0.113186 -0.187561,-0.103753 -0.131292,-0.160347 0,-0.113185 -0.187561,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3523"
d="m 79.103665,64.515797 -0.121914,0 -0.187561,0.113185 -0.131292,0.160347 0,0.103753 0,0.113186 0,0.160346 0.131292,0.103753 0.187561,0 0.121914,0 0.187561,0 0.121914,0 0.131293,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.131293,-0.160347 -0.121914,-0.113185 -0.187561,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3525"
d="m 80.913625,64.515797 -0.121915,0 -0.18756,0.113185 -0.121915,0.160347 0,0.103753 0,0.113186 0,0.160346 0.121915,0.103753 0.18756,0 0.121915,0 0.131292,0 0.187561,0 0.121914,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.121914,-0.160347 -0.187561,-0.113185 -0.131292,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3527"
d="m 82.732962,64.515797 -0.18756,0 -0.131293,0.113185 -0.121914,0.160347 0,0.103753 0,0.113186 0,0.160346 0.121914,0.103753 0.131293,0 0.18756,0 0.121914,0 0.187561,0 0.121914,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.121914,-0.160347 -0.187561,-0.113185 -0.121914,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3529"
d="m 84.542922,64.515797 -0.187561,0 -0.121914,0.113185 -0.187561,0.160347 0,0.103753 0,0.113186 0,0.160346 0.187561,0.103753 0.121914,0 0.187561,0 0.121914,0 0.131292,0 0.187561,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.187561,-0.160347 -0.131292,-0.113185 -0.121914,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3531"
d="m 86.230967,64.515797 -0.121915,0 -0.131292,0.113185 -0.187561,0.160347 0,0.103753 0,0.113186 0,0.160346 0.187561,0.103753 0.131292,0 0.121915,0 0.18756,0 0.121914,0 0.187561,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.187561,-0.160347 -0.121914,-0.113185 -0.18756,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3533"
d="m 88.040926,64.515797 -0.121914,0 -0.187561,0.113185 -0.121914,0.160347 0,0.103753 0,0.113186 0,0.160346 0.121914,0.103753 0.187561,0 0.121914,0 0.18756,0 0.131293,0 0.121914,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.121914,-0.160347 -0.131293,-0.113185 -0.18756,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3535"
d="m 89.860263,64.515797 -0.131292,0 -0.187561,0.113185 -0.121914,0.160347 0,0.103753 0,0.113186 0,0.160346 0.121914,0.103753 0.187561,0 0.131292,0 0.121915,0 0.18756,0 0.121915,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.121915,-0.160347 -0.18756,-0.113185 -0.121915,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3537"
d="m 91.642089,64.515797 -0.178183,0 -0.121914,0.113185 -0.168805,0.160347 0,0.103753 0,0.113186 0,0.160346 0.168805,0.103753 0.121914,0 0.178183,0 0.112536,0 0.112536,0 0.178183,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.178183,-0.160347 -0.112536,-0.113185 -0.112536,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3539"
d="m 93.358268,64.515797 -0.121915,0 -0.131292,0.113185 -0.187561,0.160347 0,0.103753 0,0.113186 0,0.160346 0.187561,0.103753 0.131292,0 0.121915,0 0.18756,0 0.121915,0 0.18756,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.18756,-0.160347 -0.121915,-0.113185 -0.18756,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3541"
d="m 95.168227,64.515797 -0.121914,0 -0.187561,0.113185 -0.121914,0.160347 0,0.103753 0,0.113186 0,0.160346 0.121914,0.103753 0.187561,0 0.121914,0 0.187561,0 0.131292,0 0.121914,-0.103753 0,-0.160346 0,-0.113186 0,-0.103753 -0.121914,-0.160347 -0.131292,-0.113185 -0.187561,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3543"
d="m 96.987565,64.647847 -0.131293,0 -0.18756,0 -0.121915,0.160346 0,0.113185 0,0.103754 0,0.169778 0.121915,0.103754 0.18756,0.160346 0.131293,0 0.121914,0 0.18756,-0.160346 0.121915,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.121915,-0.160346 -0.18756,0 -0.121914,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3545"
d="m 98.76939,64.647847 -0.178183,0 -0.112536,0 -0.121914,0.160346 0,0.113185 0,0.103754 0,0.169778 0.121914,0.103754 0.112536,0.160346 0.178183,0 0.112536,0 0.178183,-0.160346 0.112536,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.112536,-0.160346 -0.178183,0 -0.112536,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3547"
d="m 100.55122,64.647847 -0.18757,0 -0.13129,0 -0.18756,0.160346 0,0.113185 0,0.103754 0,0.169778 0.18756,0.103754 0.13129,0.160346 0.18757,0 0.12191,0 0.12191,-0.160346 0.18756,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.18756,-0.160346 -0.12191,0 -0.12191,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3549"
d="m 102.29553,64.647847 -0.12192,0 -0.12191,0 -0.18756,0.160346 0,0.113185 0,0.103754 0,0.169778 0.18756,0.103754 0.12191,0.160346 0.12192,0 0.18756,0 0.13129,-0.160346 0.18756,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.18756,-0.160346 -0.13129,0 -0.18756,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3551"
d="m 104.11487,64.647847 -0.1313,0 -0.18756,0 -0.12191,0.160346 0,0.113185 0,0.103754 0,0.169778 0.12191,0.103754 0.18756,0.160346 0.1313,0 0.18756,0 0.12191,-0.160346 0.12192,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.12192,-0.160346 -0.12191,0 -0.18756,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3553"
d="m 105.85918,64.647847 -0.12192,0 -0.18756,0 -0.12191,0.160346 0,0.113185 0,0.103754 0,0.169778 0.12191,0.103754 0.18756,0.160346 0.12192,0 0.13129,0 0.18756,-0.160346 0.12192,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.12192,-0.160346 -0.18756,0 -0.13129,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3555"
d="m 107.67852,64.647847 -0.18756,0 -0.1313,0 -0.12191,0.160346 0,0.113185 0,0.103754 0,0.169778 0.12191,0.103754 0.1313,0.160346 0.18756,0 0.12191,0 0.18756,-0.160346 0.12192,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.12192,-0.160346 -0.18756,0 -0.12191,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3557"
d="m 109.48848,64.647847 -0.18756,0 -0.12192,0 -0.18756,0.160346 0,0.113185 0,0.103754 0,0.169778 0.18756,0.103754 0.12192,0.160346 0.18756,0 0.12191,0 0.13129,-0.160346 0.18756,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.18756,-0.160346 -0.13129,0 -0.12191,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3559"
d="m 111.24217,64.647847 -0.1313,0 -0.12191,0 -0.18756,0.160346 0,0.113185 0,0.103754 0,0.169778 0.18756,0.103754 0.12191,0.160346 0.1313,0 0.18756,0 0.12191,-0.160346 0.18756,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.18756,-0.160346 -0.12191,0 -0.18756,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3561"
d="m 112.98648,64.647847 -0.12191,0 -0.18756,0 -0.12192,0.160346 0,0.113185 0,0.103754 0,0.169778 0.12192,0.103754 0.18756,0.160346 0.12191,0 0.18756,0 0.13129,-0.160346 0.12192,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.12192,-0.160346 -0.13129,0 -0.18756,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3563"
d="m 114.80582,64.647847 -0.13129,0 -0.18757,0 -0.12191,0.160346 0,0.113185 0,0.103754 0,0.169778 0.12191,0.103754 0.18757,0.160346 0.13129,0 0.12191,0 0.18756,-0.160346 0.12192,-0.103754 0,-0.169778 0,-0.103754 0,-0.113185 -0.12192,-0.160346 -0.18756,0 -0.12191,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3565"
d="M 97.109479,62.195492 116.61578,25.787454"
style="fill:none;stroke:#000000;stroke-width:0.87215662px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3567"
d="m 120.86402,28.107759 0,-9.866012 -8.62778,5.92338 8.62778,3.942632 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text3569"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="56.441891"
x="153.64961"
xml:space="preserve">Tol(Vi)</text>
<text
id="text3571"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="56.441891"
x="190.11137"
xml:space="preserve"> </text>
<text
id="text3573"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="52.669037"
x="-0.15004845"
xml:space="preserve">Tol</text>
<text
id="text3575"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="52.669037"
x="17.105522"
xml:space="preserve">(</text>
<text
id="text3577"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="52.669037"
x="21.306879"
xml:space="preserve">Vj)</text>
<text
id="text3579"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="52.669037"
x="36.461773"
xml:space="preserve"> </text>
<text
id="text3581"
style="font-size:13.80445671px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="79.07901"
x="50.566326"
xml:space="preserve">Vj</text>
<text
id="text3583"
style="font-size:13.80445671px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="79.07901"
x="62.270103"
xml:space="preserve"> </text>
<text
id="text3585"
style="font-size:13.80445671px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="80.135414"
x="124.24011"
xml:space="preserve">Vi</text>
<text
id="text3587"
style="font-size:13.80445671px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="80.135414"
x="135.79384"
xml:space="preserve"> </text>
<text
id="text3589"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="33.352028"
x="97.681541"
xml:space="preserve">T</text>
<text
id="text3591"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="33.352028"
x="104.43372"
xml:space="preserve"> </text>
<text
id="text3593"
style="font-size:8.70281029px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="33.804768"
x="105.33401"
xml:space="preserve">s</text>
<text
id="text3595"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="33.804768"
x="108.78512"
xml:space="preserve"> </text>
<text
id="text3597"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="83.304611"
x="99.182022"
xml:space="preserve"> </text>
<text
id="text3599"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="89.190262"
x="109.83546"
xml:space="preserve"> </text>
<text
id="text3601"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="121.18406"
x="134.29337"
xml:space="preserve">D</text>
<text
id="text3603"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="121.18406"
x="142.69608"
xml:space="preserve"> </text>
<path
id="path3605"
d="m 257.72696,55.781641 0,6.319529 -34.32358,0 0,12.63906 34.32358,0 0,6.31953 11.4412,-12.63906 z"
clip-path="url(#clipEmfPath9)"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3607"
d="m 257.72696,55.781641 0,6.319529 -34.32358,0 0,12.63906 34.32358,0 0,6.31953 11.4412,-12.63906 z"
style="fill:none;stroke:#000000;stroke-width:0.93780279px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3609"
d="m 369.28798,63.51599 c -1.91312,0 -3.46987,1.433685 -3.46987,3.206926 0,1.773241 1.55675,3.206926 3.46987,3.206926 1.93188,0 3.46987,-1.433685 3.46987,-3.206926 0,-1.773241 -1.53799,-3.206926 -3.46987,-3.206926"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path3611"
d="m 369.28798,63.51599 c -1.91312,0 -3.46987,1.433685 -3.46987,3.206926 0,1.773241 1.55675,3.206926 3.46987,3.206926 1.93188,0 3.46987,-1.433685 3.46987,-3.206926 0,-1.773241 -1.53799,-3.206926 -3.46987,-3.206926"
style="fill:none;stroke:#000000;stroke-width:1.81933737px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3613"
d="m 371.85756,15.4687 c -29.99093,0 -54.29878,23.221914 -54.29878,51.857873 0,28.635959 24.30785,51.839007 54.29878,51.839007 29.99094,0 54.29878,-23.203048 54.29878,-51.839007 0,-28.635959 -24.30784,-51.857873 -54.29878,-51.857873"
style="fill:none;stroke:#000000;stroke-width:0.88153464px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3615"
d="M 370.2633,63.383941 389.7696,26.975903"
style="fill:none;stroke:#000000;stroke-width:0.88153464px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path3617"
d="m 394.02722,29.315073 0,-9.884877 -8.62779,5.92338 8.62779,3.961497 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<text
id="text3619"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="13.129531"
x="400.1792"
xml:space="preserve">Tol(Vn)</text>
<text
id="text3621"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="13.129531"
x="440.69229"
xml:space="preserve"> </text>
<text
id="text3623"
style="font-size:15.00484467px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="85.719231"
x="372.2702"
xml:space="preserve">Vn</text>
<text
id="text3625"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="85.719231"
x="389.22568"
xml:space="preserve"> </text>
<text
id="text3627"
style="font-size:15.00484467px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="66.854965"
x="378.12207"
xml:space="preserve">Pn</text>
<text
id="text3629"
style="font-size:13.80445671px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="66.854965"
x="394.17728"
xml:space="preserve"> </text>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 30 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 57 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 73 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 69 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 92 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 68 KiB

View File

@@ -1,690 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="584.78479"
height="346.51709"
id="svg5449"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="operations_image008.svg">
<defs
id="defs5451">
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5462"
height="20.436331"
width="42.527756"
y="236.21996"
x="17.431871" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5465"
height="15.77805"
width="13.975552"
y="176.11308"
x="153.12997" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5468"
height="20.436331"
width="70.178307"
y="228.70659"
x="153.12997" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5471"
height="20.286064"
width="14.125827"
y="262.9675"
x="67.773911" />
</clipPath>
<clipPath
id="clipEmfPath5"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5474"
height="15.77805"
width="13.975552"
y="176.86443"
x="504.02151" />
</clipPath>
<clipPath
id="clipEmfPath6"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5477"
height="20.286064"
width="14.125827"
y="61.609528"
x="400.63248" />
</clipPath>
<clipPath
id="clipEmfPath7"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5480"
height="15.77805"
width="47.787373"
y="128.0276"
x="285.6723" />
</clipPath>
<clipPath
id="clipEmfPath8"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5483"
height="15.627783"
width="18.483795"
y="155.52649"
x="448.7204" />
</clipPath>
<clipPath
id="clipEmfPath9"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5486"
height="20.286064"
width="13.975552"
y="0"
x="434.89514" />
</clipPath>
<clipPath
id="clipEmfPath10"
clipPathUnits="userSpaceOnUse">
<rect
id="rect5489"
height="15.77805"
width="13.073904"
y="256.50601"
x="378.54211" />
</clipPath>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8423"
id="linearGradient8429"
x1="110.76892"
y1="67.881042"
x2="361.97699"
y2="67.881042"
gradientUnits="userSpaceOnUse"
spreadMethod="reflect" />
<linearGradient
inkscape:collect="always"
id="linearGradient8423">
<stop
style="stop-color:#e6e6e6;stop-opacity:1;"
offset="0"
id="stop8425" />
<stop
style="stop-color:#e6e6e6;stop-opacity:0;"
offset="1"
id="stop8427" />
</linearGradient>
<linearGradient
gradientTransform="translate(-110.78355,86.858072)"
y2="67.881042"
x2="361.97699"
y1="67.881042"
x1="110.76892"
spreadMethod="reflect"
gradientUnits="userSpaceOnUse"
id="linearGradient9240"
xlink:href="#linearGradient8423"
inkscape:collect="always" />
<linearGradient
gradientTransform="translate(-110.78355,86.858072)"
y2="67.881042"
x2="361.97699"
y1="67.881042"
x1="110.76892"
spreadMethod="reflect"
gradientUnits="userSpaceOnUse"
id="linearGradient9240-6"
xlink:href="#linearGradient8423-0"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
id="linearGradient8423-0">
<stop
style="stop-color:#e6e6e6;stop-opacity:1;"
offset="0"
id="stop8425-3" />
<stop
style="stop-color:#e6e6e6;stop-opacity:0;"
offset="1"
id="stop8427-6" />
</linearGradient>
<linearGradient
y2="67.881042"
x2="361.97699"
y1="67.881042"
x1="110.76892"
spreadMethod="reflect"
gradientTransform="translate(221.10825,93.8465)"
gradientUnits="userSpaceOnUse"
id="linearGradient9320"
xlink:href="#linearGradient8423-0"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2"
inkscape:cx="287.32914"
inkscape:cy="191.95398"
inkscape:document-units="px"
inkscape:current-layer="g5491"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1430"
inkscape:window-height="967"
inkscape:window-x="52"
inkscape:window-y="33"
inkscape:window-maximized="0" />
<metadata
id="metadata5454">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(210.18628,-240.65622)">
<g
id="g5491"
transform="translate(-209.88573,236.75033)">
<path
id="path5188-8-2"
d="m 394.75926,111.82294 -62.72198,99.8092 188.16589,0 62.72197,-99.8092 z"
style="fill:url(#linearGradient9320);fill-opacity:1;stroke:#000000;stroke-width:0.32020226px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.40773749;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 426.3364,176.31047 -14.09469,-6.11506"
id="path9261"
inkscape:connector-curvature="0" />
<path
id="path5613"
d="m 396.01672,98.251149 -62.55187,99.927651 187.6556,0 62.55187,-99.927651 z"
style="fill:none;stroke:#000000;stroke-width:0.93921721px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5188-8"
d="m 62.867449,104.83451 -62.72198013,99.8092 188.16590113,0 62.72197,-99.8092 z"
style="fill:url(#linearGradient9240);fill-opacity:1;stroke:#000000;stroke-width:0.32020226px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5533"
d="m 63.810417,116.07198 -62.5518659,99.92764 187.6555989,0 62.55187,-99.92764 z"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5525"
d="m 63.158137,94.365467 -62.55186545,99.927653 187.65559845,0 62.55187,-99.927653 z"
style="fill:none;stroke:#000000;stroke-width:0.93921721px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text5493"
style="font-size:13.82527733px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="350.42297"
x="-0.30054951"
xml:space="preserve"> </text>
<text
id="text5495"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="249.29318"
x="17.431871"
xml:space="preserve">Tol(Ei)</text>
<text
id="text5497"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="249.29318"
x="53.798363"
xml:space="preserve"> </text>
<!--
<path
style="fill:none;stroke:none;"
clip-path="url(#clipEmfPath1)" d=" " />
-->
<path
id="path5499"
d="m 63.810417,104.80194 -62.5518659,99.92765 187.6555989,0 62.55187,-99.92765 z"
style="fill:none;stroke:none"
inkscape:connector-curvature="0" />
<!--
<path
style="fill:none;stroke:none;" d="
" " />
-->
<text
id="text5527"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="189.18633"
x="153.12997"
xml:space="preserve">Fj</text>
<text
id="text5529"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="189.18633"
x="162.89783"
xml:space="preserve"> </text>
<path
id="path5535"
d="m 131.24621,178.05717 0,68.37155"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5537"
d="m 131.49041,179.57863 -0.20663,8.01111 c -0.009,0.3475 -0.30055,0.61985 -0.63867,0.61046 -0.34751,-0.009 -0.61988,-0.29114 -0.61049,-0.63863 l 0.20663,-8.02051 c 0.009,-0.3381 0.30055,-0.61046 0.64806,-0.61046 0.33812,0.009 0.61049,0.30053 0.6011,0.64803 z m 2.95853,6.84654 -3.9541,7.41005 -3.55963,-7.60727 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5539"
d="m 130.24125,227.64533 0,-5.75711 c 0,-0.34749 0.28177,-0.62925 0.62928,-0.62925 0.34751,0 0.61988,0.28176 0.61988,0.62925 l 0,5.75711 c 0,0.34749 -0.27237,0.62924 -0.61988,0.62924 -0.34751,0 -0.62928,-0.28175 -0.62928,-0.62924 z m -3.12759,-4.50802 3.75687,-7.51335 3.75686,7.51335 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5541"
d="m 204.50516,247.05796 -73.63463,0"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text5543"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="241.77983"
x="153.12997"
xml:space="preserve">2</text>
<text
id="text5545"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="241.77983"
x="160.19289"
xml:space="preserve">·</text>
<text
id="text5547"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="241.77983"
x="163.79948"
xml:space="preserve">Tol(Fj)</text>
<text
id="text5549"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="241.77983"
x="199.86542"
xml:space="preserve"> </text>
<text
id="text5551"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="276.04074"
x="67.773911"
xml:space="preserve">Ei</text>
<text
id="text5553"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="276.04074"
x="77.842323"
xml:space="preserve"> </text>
<path
id="path5555"
d="M 96.68302,31.048948 97.058707,168.54338"
clip-path="url(#clipEmfPath4)"
style="fill:none;stroke:#000000;stroke-width:2.81765175px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5557"
d="m 83.533979,32.55162 0.375687,259.58649"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5559"
d="m 109.83206,32.175952 0.37569,259.586488"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5561"
d="m 96.870863,286.87876 c -7.156835,0 -12.961197,2.43245 -12.961197,5.44718 0,3.00534 5.804362,5.44718 12.961197,5.44718 7.156837,0 12.961197,-2.44184 12.961197,-5.44718 0,-3.01473 -5.80436,-5.44718 -12.961197,-5.44718"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5563"
d="m 96.495176,25.41393 c -7.156835,0 -12.961197,2.43245 -12.961197,5.447184 0,3.005343 5.804362,5.447184 12.961197,5.447184 7.156834,0 12.961194,-2.441841 12.961194,-5.447184 0,-3.014734 -5.80436,-5.447184 -12.961194,-5.447184"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5565"
d="m 96.833294,26.165266 c -1.953571,0 -3.531456,1.577805 -3.531456,3.531278 0,1.962864 1.577885,3.540669 3.531456,3.540669 1.962964,0 3.540846,-1.577805 3.540846,-3.540669 0,-1.953473 -1.577882,-3.531278 -3.540846,-3.531278"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5567"
d="m 96.833294,26.165266 c -1.953571,0 -3.531456,1.577805 -3.531456,3.531278 0,1.962864 1.577885,3.540669 3.531456,3.540669 1.962964,0 3.540846,-1.577805 3.540846,-3.540669 0,-1.953473 -1.577882,-3.531278 -3.540846,-3.531278"
style="fill:none;stroke:#000000;stroke-width:2.06627798px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5569"
d="m 96.833294,288.7571 c -1.953571,0 -3.531456,1.5778 -3.531456,3.53127 0,1.96287 1.577885,3.54067 3.531456,3.54067 1.962964,0 3.540846,-1.5778 3.540846,-3.54067 0,-1.95347 -1.577882,-3.53127 -3.540846,-3.53127"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5571"
d="m 96.833294,288.7571 c -1.953571,0 -3.531456,1.5778 -3.531456,3.53127 0,1.96287 1.577885,3.54067 3.531456,3.54067 1.962964,0 3.540846,-1.5778 3.540846,-3.54067 0,-1.95347 -1.577882,-3.53127 -3.540846,-3.53127"
style="fill:none;stroke:#000000;stroke-width:2.06627798px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5573"
d="m 96.870863,248.18497 c -7.156835,0 -12.961197,2.43245 -12.961197,5.44718 0,3.00534 5.804362,5.44719 12.961197,5.44719 7.156837,0 12.961197,-2.44185 12.961197,-5.44719 0,-3.01473 -5.80436,-5.44718 -12.961197,-5.44718"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5575"
d="m 95.931646,254.19565 -11.646294,0"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5577"
d="m 77.2694,254.81551 -71.5026063,0 c -0.3475104,0 -0.6292756,-0.27236 -0.6292756,-0.61986 0,-0.34749 0.2817652,-0.62924 0.6292756,-0.62924 l 71.5026063,0 c 0.34751,0 0.629275,0.28175 0.629275,0.62924 0,0.3475 -0.281765,0.61986 -0.629275,0.61986 z m -1.249159,-4.37654 7.513738,3.75668 -7.513738,3.75668 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5579"
d="M 97.058707,204.6075 96.68302,288.7571"
style="fill:none;stroke:#000000;stroke-width:2.81765175px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5581"
d="m 98.467532,169.67978 -0.03757,2.81751 -2.817652,-0.0282 0.03757,-2.81751 2.817651,0.0282 z m -0.06575,5.63502 -0.02818,2.8175 -2.817652,-0.0282 0.02818,-2.81751 2.817651,0.0282 z m -0.06574,5.63501 -0.02818,2.81751 -2.817651,-0.0282 0.02818,-2.81751 2.817652,0.0282 z m -0.05635,5.63502 -0.03757,2.81751 -2.817651,-0.0282 0.03757,-2.81751 2.817652,0.0282 z m -0.06575,5.63502 -0.02818,2.81751 -2.817651,-0.0282 0.02818,-2.81751 2.817652,0.0282 z m -0.06574,5.63502 -0.02818,2.81751 -2.817652,-0.0282 0.02818,-2.81751 2.817652,0.0282 z m -0.05635,5.63501 0,0 -2.817651,-0.0282 0,0 2.817651,0.0282 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5583"
d="m 288.61206,176.19762 0.0188,6.29243 -34.37535,0.13149 0.047,12.58487 34.37535,-0.13149 0.0282,6.29244 11.41149,-12.62244 z"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5585"
d="m 288.61206,176.19762 0.0188,6.29243 -34.37535,0.13149 0.047,12.58487 34.37535,-0.13149 0.0282,6.29244 11.41149,-12.62244 z"
style="fill:none;stroke:#000000;stroke-width:0.93921721px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<!--
<path
style="fill:none;stroke:none;" d=" " />
-->
<path
id="path5587"
d="m 396.669,111.94902 -62.55187,99.92765 187.6556,0 62.55187,-99.92765 z"
style="fill:none;stroke:none"
inkscape:connector-curvature="0" />
<!--
<path
style="fill:none;stroke:none;" d="
" " />
-->
<text
id="text5615"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="189.93767"
x="504.02151"
xml:space="preserve">Fj</text>
<text
id="text5617"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="189.93767"
x="513.78937"
xml:space="preserve"> </text>
<path
id="path5619"
d="m 397.04468,101.43032 -62.55186,99.92765 187.6556,0 62.55186,-99.92765 z"
clip-path="url(#clipEmfPath5)"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5621"
d="m 396.669,123.21906 -62.55187,99.92765 187.6556,0 62.55187,-99.92765 z"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text5623"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="74.68277"
x="400.63248"
xml:space="preserve">Ei</text>
<text
id="text5625"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="74.68277"
x="410.7009"
xml:space="preserve"> </text>
<path
id="path5627"
d="m 429.5416,38.186637 0.37569,137.494433"
clip-path="url(#clipEmfPath6)"
style="fill:none;stroke:#000000;stroke-width:2.81765175px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5629"
d="M 416.39256,39.689309 416.76825,299.2758"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5631"
d="m 442.69064,39.313641 0.37569,259.586489"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5633"
d="m 429.72944,294.01645 c -7.15683,0 -12.96119,2.44184 -12.96119,5.44718 0,3.00534 5.80436,5.44718 12.96119,5.44718 7.15684,0 12.9612,-2.44184 12.9612,-5.44718 0,-3.00534 -5.80436,-5.44718 -12.9612,-5.44718"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5635"
d="m 429.35376,32.55162 c -7.15684,0 -12.9612,2.441841 -12.9612,5.447183 0,3.005343 5.80436,5.447184 12.9612,5.447184 7.15683,0 12.96119,-2.441841 12.96119,-5.447184 0,-3.005342 -5.80436,-5.447183 -12.96119,-5.447183"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5637"
d="m 429.69187,33.302955 c -1.95357,0 -3.53145,1.577805 -3.53145,3.531278 0,1.953473 1.57788,3.550061 3.53145,3.550061 1.95358,0 3.55024,-1.596588 3.55024,-3.550061 0,-1.953473 -1.59666,-3.531278 -3.55024,-3.531278"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5639"
d="m 429.69187,33.302955 c -1.95357,0 -3.53145,1.577805 -3.53145,3.531278 0,1.953473 1.57788,3.550061 3.53145,3.550061 1.95358,0 3.55024,-1.596588 3.55024,-3.550061 0,-1.953473 -1.59666,-3.531278 -3.55024,-3.531278"
style="fill:none;stroke:#000000;stroke-width:2.06627798px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5641"
d="m 429.69187,295.89479 c -1.95357,0 -3.53145,1.5778 -3.53145,3.53127 0,1.95348 1.57788,3.55006 3.53145,3.55006 1.95358,0 3.55024,-1.59658 3.55024,-3.55006 0,-1.95347 -1.59666,-3.53127 -3.55024,-3.53127"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5643"
d="m 429.69187,295.89479 c -1.95357,0 -3.53145,1.5778 -3.53145,3.53127 0,1.95348 1.57788,3.55006 3.53145,3.55006 1.95358,0 3.55024,-1.59658 3.55024,-3.55006 0,-1.95347 -1.59666,-3.53127 -3.55024,-3.53127"
style="fill:none;stroke:#000000;stroke-width:2.06627798px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5645"
d="m 429.91729,211.74519 -0.37569,84.1496"
style="fill:none;stroke:#000000;stroke-width:2.81765175px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5647"
d="m 431.32611,176.82686 -0.0376,2.81751 -2.81765,-0.0376 0.0376,-2.81751 2.81765,0.0376 z m -0.0564,5.63502 -0.0376,2.81751 -2.81765,-0.0376 0.0376,-2.81751 2.81765,0.0376 z m -0.0751,5.63501 -0.0188,2.81751 -2.81765,-0.0376 0.0188,-2.81751 2.81765,0.0376 z m -0.0564,5.63502 -0.0376,2.81751 -2.81765,-0.0376 0.0376,-2.8175 2.81765,0.0376 z m -0.0563,5.63502 -0.0376,2.81751 -2.81766,-0.0376 0.0376,-2.81751 2.81766,0.0376 z m -0.0751,5.63502 -0.0188,2.81751 -2.81765,-0.0376 0.0188,-2.81751 2.81765,0.0376 z m -0.0564,5.61623 0,0 -2.81765,0 0,0 2.81765,0 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5649"
d="m 429.69187,173.80273 c -1.95357,0 -3.53145,1.57781 -3.53145,3.53128 0,1.95347 1.57788,3.55006 3.53145,3.55006 1.95358,0 3.55024,-1.59659 3.55024,-3.55006 0,-1.95347 -1.59666,-3.53128 -3.55024,-3.53128"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path5651"
d="m 429.69187,173.80273 c -1.95357,0 -3.53145,1.57781 -3.53145,3.53128 0,1.95347 1.57788,3.55006 3.53145,3.55006 1.95358,0 3.55024,-1.59659 3.55024,-3.55006 0,-1.95347 -1.59666,-3.53128 -3.55024,-3.53128"
style="fill:none;stroke:#000000;stroke-width:2.06627798px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5653"
d="m 429.44768,160.27869 c -9.80543,0 -17.75121,7.94538 -17.75121,17.75031 0,9.80493 7.94578,17.7503 17.75121,17.7503 9.80543,0 17.7512,-7.94537 17.7512,-17.7503 0,-9.80493 -7.94577,-17.75031 -17.7512,-17.75031"
style="fill:none;stroke:#000000;stroke-width:0.93921721px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5655"
d="m 428.79023,178.08535 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0564,0.15027 -0.15027,0.15027 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15027 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17899,0 -0.93921,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93921,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0563,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17899,0 -0.93921,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93921,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0563,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17899,0 -0.93922,0 c -0.0939,0 -0.16905,-0.0564 -0.16905,-0.15027 0,-0.0751 0.0751,-0.15027 0.16905,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16905,0.0751 0.16905,0.15027 0,0.0939 -0.0751,0.15027 -0.16905,0.15027 z m -2.17899,0 -0.93922,0 c -0.0939,0 -0.16905,-0.0564 -0.16905,-0.15027 0,-0.0751 0.0751,-0.15027 0.16905,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16905,0.0751 0.16905,0.15027 0,0.0939 -0.0751,0.15027 -0.16905,0.15027 z m -2.17899,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15027 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text5657"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="141.10085"
x="285.6723"
xml:space="preserve">Tol(Vn)</text>
<text
id="text5659"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="141.10085"
x="327.4487"
xml:space="preserve"> </text>
<text
id="text5661"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="168.59973"
x="448.7204"
xml:space="preserve">Vn</text>
<text
id="text5663"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="168.59973"
x="464.1987"
xml:space="preserve"> </text>
<path
id="path5665"
d="m 429.69187,303.78381 0,0.93917 c 0,0.0939 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z m 0,2.19766 0,0.93917 c 0,0.0751 -0.0564,0.15026 -0.15027,0.15026 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.15026 l 0,-0.93917 c 0,-0.0939 0.0751,-0.16905 0.15028,-0.16905 0.0939,0 0.15027,0.0751 0.15027,0.16905 z m 0,2.17887 0,0.93917 c 0,0.0939 -0.0564,0.16905 -0.15027,0.16905 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.16905 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z m 0,2.19766 0,0.93917 c 0,0.0939 -0.0564,0.15026 -0.15027,0.15026 -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15026 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z m 0,2.19765 0,0.93917 c 0,0.0751 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.15027 l 0,-0.93917 c 0,-0.0939 0.0751,-0.16905 0.15028,-0.16905 0.0939,0 0.15027,0.0751 0.15027,0.16905 z m 0,2.17888 0,0.93917 c 0,0.0939 -0.0564,0.16905 -0.15027,0.16905 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.16905 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z m 0,2.19765 0,0.93917 c 0,0.0939 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15026 0.15028,-0.15026 0.0939,0 0.15027,0.0751 0.15027,0.15026 z m 0,2.19766 0,0.93917 c 0,0.0751 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.15027 l 0,-0.93917 c 0,-0.0939 0.0751,-0.16905 0.15028,-0.16905 0.0939,0 0.15027,0.0751 0.15027,0.16905 z m 0,2.17888 0,0.93917 c 0,0.0939 -0.0564,0.16905 -0.15027,0.16905 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.16905 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z m 0,2.19765 0,0.93917 c 0,0.0939 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0563 -0.15028,-0.15027 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15026 0.15028,-0.15026 0.0939,0 0.15027,0.0751 0.15027,0.15026 z m 0,2.19766 0,0.93917 c 0,0.0751 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.15027 l 0,-0.93917 c 0,-0.0939 0.0751,-0.16905 0.15028,-0.16905 0.0939,0 0.15027,0.0751 0.15027,0.16905 z m 0,2.17887 0,0.93917 c 0,0.0939 -0.0564,0.16905 -0.15027,0.16905 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.16905 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15026 0.15028,-0.15026 0.0939,0 0.15027,0.0751 0.15027,0.15026 z m 0,2.19766 0,0.93917 c 0,0.0939 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z m 0,2.19766 0,0.93917 c 0,0.0751 -0.0564,0.15026 -0.15027,0.15026 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.15026 l 0,-0.93917 c 0,-0.0939 0.0751,-0.16905 0.15028,-0.16905 0.0939,0 0.15027,0.0751 0.15027,0.16905 z m 0,2.17887 0,0.93917 c 0,0.0939 -0.0564,0.16905 -0.15027,0.16905 -0.0751,0 -0.15028,-0.0751 -0.15028,-0.16905 l 0,-0.93917 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z m 0,2.19766 0,0.5635 c 0,0.0939 -0.0564,0.15027 -0.15027,0.15027 -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 l 0,-0.5635 c 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 0.0939,0 0.15027,0.0751 0.15027,0.15027 z"
clip-path="url(#clipEmfPath8)"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5667"
d="m 428.54603,32.927287 0,-3.756678 c 0,-0.338101 0.28176,-0.619852 0.61988,-0.619852 0.3569,0 0.61989,0.281751 0.61989,0.619852 l 0,3.756678 c 0,0.356885 -0.26299,0.619852 -0.61989,0.619852 -0.33812,0 -0.61988,-0.262967 -0.61988,-0.619852 z m 0,-8.771844 0,-3.756679 c 0,-0.338101 0.28176,-0.619851 0.61988,-0.619851 0.3569,0 0.61989,0.28175 0.61989,0.619851 l 0,3.756679 c 0,0.356884 -0.26299,0.638635 -0.61989,0.638635 -0.33812,0 -0.61988,-0.281751 -0.61988,-0.638635 z m -3.13699,-4.752198 3.75687,-7.513357 3.75687,7.513357 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text5669"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="13.073241"
x="434.89514"
xml:space="preserve">Ci</text>
<text
id="text5671"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="13.073241"
x="445.56464"
xml:space="preserve"> </text>
<path
id="path5673"
d="m 429.16591,323.84447 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15026 -0.15028,0.15026 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15026 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15026 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0751,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15026 -0.15028,0.15026 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15026 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15026 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0751,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15026 -0.15028,0.15026 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15026 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15026 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0751,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15026 -0.15028,0.15026 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15026 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15026 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0751,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15026 -0.15028,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15026 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0751,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0564,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15026 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0751,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0564,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15026 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0751,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0564,0.15026 -0.15027,0.15026 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15026 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15026 -0.16906,0.15026 z"
clip-path="url(#clipEmfPath9)"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5675"
d="m 394.47123,189.95645 0,121.34072 c 0,0.35688 -0.26298,0.61985 -0.61988,0.61985 -0.33812,0 -0.61989,-0.26297 -0.61989,-0.61985 l 0,-121.34072 c 0,-0.3381 0.28177,-0.61985 0.61989,-0.61985 0.3569,0 0.61988,0.28175 0.61988,0.61985 z m -3.1182,1.25849 2.49832,-12.52853 2.49831,12.52853 z m 4.99663,118.82374 -2.49831,12.52852 -2.49832,-12.52852 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text5677"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="269.57925"
x="378.54211"
xml:space="preserve">t</text>
<text
id="text5679"
style="font-size:8.71593571px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="271.53271"
x="383.35089"
xml:space="preserve">i</text>
<text
id="text5681"
style="font-size:13.82527733px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="269.57925"
x="385.45474"
xml:space="preserve"> </text>
<path
id="path5683"
d="m 427.28748,175.68107 -13.90042,-4.50801"
clip-path="url(#clipEmfPath10)"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5685"
d="m 406.47442,169.14445 -74.04788,-23.29141 c -0.31933,-0.1127 -0.50718,-0.4508 -0.41326,-0.7889 0.11271,-0.31932 0.46961,-0.50715 0.78895,-0.41323 l 74.04788,23.2914 c 0.33812,0.1127 0.50718,0.46959 0.41326,0.78891 -0.11271,0.3381 -0.45083,0.50715 -0.78895,0.41323 z m 0.13149,-4.56436 6.02978,5.84163 -8.2839,1.33362 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5531"
d="m 64.186104,94.28324 -62.5518661,99.92765 187.6556021,0 62.55186,-99.92765 z"
clip-path="url(#clipEmfPath2)"
style="fill:none;stroke:#000000;stroke-width:0.30994168px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0"
d="m 435.5,297.51709 0,30.5"
id="path9263"
inkscape:connector-curvature="0"
transform="translate(-5.51879,5.21045)" />
<path
id="path5655-9"
d="m 428.60791,323.11926 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.15027,0.0751 0.15027,0.15027 0,0.0939 -0.0564,0.15027 -0.15027,0.15027 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15027 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17899,0 -0.93921,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93921,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0563,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17899,0 -0.93921,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93921,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0563,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17899,0 -0.93922,0 c -0.0939,0 -0.16905,-0.0564 -0.16905,-0.15027 0,-0.0751 0.0751,-0.15027 0.16905,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16905,0.0751 0.16905,0.15027 0,0.0939 -0.0751,0.15027 -0.16905,0.15027 z m -2.17899,0 -0.93922,0 c -0.0939,0 -0.16905,-0.0564 -0.16905,-0.15027 0,-0.0751 0.0751,-0.15027 0.16905,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19776,0 -0.93922,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93922,0 c 0.0939,0 0.16905,0.0751 0.16905,0.15027 0,0.0939 -0.0751,0.15027 -0.16905,0.15027 z m -2.17899,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z m -2.17898,0 -0.93922,0 c -0.0939,0 -0.16906,-0.0564 -0.16906,-0.15027 0,-0.0751 0.0751,-0.15027 0.16906,-0.15027 l 0.93922,0 c 0.0751,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0751,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93922,0 c -0.0751,0 -0.15027,-0.0564 -0.15027,-0.15027 0,-0.0751 0.0751,-0.15027 0.15027,-0.15027 l 0.93922,0 c 0.0939,0 0.15028,0.0751 0.15028,0.15027 0,0.0939 -0.0564,0.15027 -0.15028,0.15027 z m -2.19777,0 -0.93921,0 c -0.0751,0 -0.15028,-0.0564 -0.15028,-0.15027 0,-0.0751 0.0751,-0.15027 0.15028,-0.15027 l 0.93921,0 c 0.0939,0 0.16906,0.0751 0.16906,0.15027 0,0.0939 -0.0751,0.15027 -0.16906,0.15027 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15027475px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5687"
d="m 332.99007,145.25198 -46.96086,0"
style="fill:none;stroke:#000000;stroke-width:0.31933385px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 102.40789,28.856948 0,131.108192"
id="path9259"
inkscape:connector-curvature="0"
transform="translate(-215.40452,241.96078)" />
<path
style="fill:none;stroke:#000000;stroke-width:3.01673079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 219.59548,276.94055 0,132.57463"
id="path9259-4"
inkscape:connector-curvature="0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 52 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 31 KiB

View File

@@ -1,471 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="305.43796"
height="252.3311"
id="svg6026"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="operations_image010.svg">
<defs
id="defs6028">
<marker
inkscape:stockid="Arrow2Mend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Mend"
style="overflow:visible;">
<path
id="path4172"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(0.6) rotate(180) translate(0,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Lend"
style="overflow:visible;">
<path
id="path4166"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(1.1) rotate(180) translate(1,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Lstart"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Lstart"
style="overflow:visible">
<path
id="path4145"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(0.8) translate(12.5,0)" />
</marker>
<marker
inkscape:stockid="TriangleInL"
orient="auto"
refY="0.0"
refX="0.0"
id="TriangleInL"
style="overflow:visible">
<path
id="path4278"
d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(-0.8)" />
</marker>
<marker
inkscape:stockid="Arrow2Lstart"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Lstart"
style="overflow:visible">
<path
id="path4163"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(1.1) translate(1,0)" />
</marker>
<clipPath
id="clipEmfPath1"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6039"
height="20.260248"
width="56.619602"
y="156.22903"
x="227.8373" />
</clipPath>
<clipPath
id="clipEmfPath2"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6042"
height="15.457819"
width="14.192648"
y="69.935379"
x="190.0909" />
</clipPath>
<clipPath
id="clipEmfPath3"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6045"
height="20.410324"
width="70.510284"
y="222.41251"
x="54.203835" />
</clipPath>
<clipPath
id="clipEmfPath4"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6048"
height="15.607895"
width="52.693977"
y="0.15007591"
x="249.42822" />
</clipPath>
<clipPath
id="clipEmfPath5"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6051"
height="15.457819"
width="14.192648"
y="165.23358"
x="36.840488" />
</clipPath>
<clipPath
id="clipEmfPath6"
clipPathUnits="userSpaceOnUse">
<rect
id="rect6054"
height="15.607895"
width="29.744165"
y="117.50944"
x="135.4341" />
</clipPath>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient8423"
id="linearGradient8429"
x1="110.76892"
y1="67.881042"
x2="361.97699"
y2="67.881042"
gradientUnits="userSpaceOnUse"
spreadMethod="reflect" />
<linearGradient
inkscape:collect="always"
id="linearGradient8423">
<stop
style="stop-color:#e6e6e6;stop-opacity:1;"
offset="0"
id="stop8425" />
<stop
style="stop-color:#e6e6e6;stop-opacity:0;"
offset="1"
id="stop8427" />
</linearGradient>
<linearGradient
gradientTransform="translate(-110.24646,81.10175)"
y2="67.881042"
x2="361.97699"
y1="67.881042"
x1="110.76892"
spreadMethod="reflect"
gradientUnits="userSpaceOnUse"
id="linearGradient10403"
xlink:href="#linearGradient8423"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.1796758"
inkscape:cx="216.31418"
inkscape:cy="144.5169"
inkscape:document-units="px"
inkscape:current-layer="g6056"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1482"
inkscape:window-height="809"
inkscape:window-x="110"
inkscape:window-y="110"
inkscape:window-maximized="0" />
<metadata
id="metadata6031">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(52.724304,-303.33949)">
<g
id="g6056"
transform="translate(-51.81839,299.79117)">
<path
id="path6098"
d="m 64.131139,109.94937 -62.8477613,99.80048 188.5432823,0 62.84776,-99.80048 z"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path5188-8"
d="m 63.404544,99.0782 -62.72197958,99.80919 188.16589558,0 62.72197,-99.80919 z"
style="fill:url(#linearGradient10403);fill-opacity:1;stroke:#000000;stroke-width:0.32020226px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6090"
d="m 64.131139,87.682861 -62.8477613,99.800489 188.5432823,0 62.84776,-99.800489 z"
style="fill:none;stroke:#000000;stroke-width:0.94366008px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text6058"
style="font-size:13.89067554px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="255.87943"
x="-0.90591365"
xml:space="preserve"> </text>
<text
id="text6060"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="169.28563"
x="227.8373"
xml:space="preserve">Tol(Vijm)</text>
<text
id="text6062"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="169.28563"
x="280.53128"
xml:space="preserve"> </text>
<!--
<path
style="fill:none;stroke:none;"
clip-path="url(#clipEmfPath1)" d=" " />
-->
<path
id="path6064"
d="m 64.131139,98.693673 -62.8477613,99.800487 188.5432823,0 62.84776,-99.800487 z"
style="fill:none;stroke:none"
inkscape:connector-curvature="0" />
<!--
<path
style="fill:none;stroke:none;" d="
" " />
-->
<text
id="text6092"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="82.991982"
x="190.0909"
xml:space="preserve">Fi</text>
<text
id="text6094"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="82.991982"
x="199.90495"
xml:space="preserve"> </text>
<path
id="path6096"
d="m 64.508603,88.188359 -62.8477613,99.800481 188.5432783,0 62.84777,-99.800481 z"
clip-path="url(#clipEmfPath2)"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6100"
d="m 32.235428,171.85568 0,68.28454"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6102"
d="m 33.245144,173.3752 -0.207605,8.00092 c -0.0094,0.34705 -0.301971,0.61907 -0.651125,0.60969 -0.349154,-0.009 -0.622816,-0.30016 -0.613379,-0.63783 l 0.217042,-8.0103 c 0.0094,-0.34705 0.292534,-0.61906 0.641688,-0.60968 0.349155,0.009 0.622816,0.30015 0.613379,0.6472 z m 2.963093,6.83783 -3.972809,7.40062 -3.567035,-7.59759 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15098561px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6104"
d="m 31.990077,221.38073 0,-5.75916 c 0,-0.33767 0.283098,-0.61906 0.622815,-0.61906 0.349154,0 0.632252,0.28139 0.632252,0.61906 l 0,5.75916 c 0,0.34705 -0.283098,0.61907 -0.632252,0.61907 -0.339717,0 -0.622815,-0.27202 -0.622815,-0.61907 z m -3.151825,-4.50227 3.77464,-7.5038 3.77464,7.5038 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15098561px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6106"
d="m 105.84091,240.75929 -73.982946,0"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text6108"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="235.46912"
x="54.203835"
xml:space="preserve">2·Tol(Fj)</text>
<text
id="text6110"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="235.46912"
x="101.16036"
xml:space="preserve"> </text>
<text
id="text6112"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="13.206681"
x="249.42822"
xml:space="preserve">2·Tol(Fi)</text>
<text
id="text6114"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="13.206681"
x="296.23376"
xml:space="preserve"> </text>
<text
id="text6116"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="178.29019"
x="36.840488"
xml:space="preserve">Fj</text>
<text
id="text6118"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="178.29019"
x="46.654552"
xml:space="preserve"> </text>
<path
id="path6120"
d="m 124.75186,137.71341 c -6.89815,0 -12.49406,5.55281 -12.49406,12.4094 0,6.8566 5.59591,12.40941 12.49406,12.40941 6.89816,0 12.48462,-5.55281 12.48462,-12.40941 0,-6.85659 -5.58646,-12.4094 -12.48462,-12.4094"
clip-path="url(#clipEmfPath5)"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6122"
d="m 124.90285,39.038497 c -54.515245,0 -98.706846,6.209391 -98.706846,13.882022 0,7.663252 44.191601,13.882023 98.706846,13.882023 54.52468,0 98.70684,-6.218771 98.70684,-13.882023 0,-7.672631 -44.18216,-13.882022 -98.70684,-13.882022"
style="fill:none;stroke:#000000;stroke-width:1.25506794px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6124"
d="m 124.72355,150.09467 c -54.203833,0 -98.150082,-43.33442 -98.150082,-96.798961"
style="fill:none;stroke:#000000;stroke-width:1.25506794px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6126"
d="m 123.59116,141.8405 c -48.579621,0 -87.958556,-39.97647 -87.958556,-89.29517"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6128"
d="m 125.10102,159.09923 c -58.997632,0 -106.831761,-47.70538 -106.831761,-106.5539"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6130"
d="M 230.93249,53.436405 C 230.77207,112.07857 182.64541,159.4838 123.44017,159.32434"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6132"
d="M 223.39265,54.205544 C 222.3735,108.07342 177.95542,150.92947 124.18567,149.92584"
style="fill:none;stroke:#000000;stroke-width:1.25506794px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6134"
d="m 212.91802,52.789203 c 0.96254,48.277547 -38.46358,88.197737 -88.07179,89.173237"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6136"
d="m 124.71412,36.036979 c -58.582422,0 -106.067397,7.560074 -106.067397,16.88354 0,9.323467 47.484975,16.883541 106.067397,16.883541 58.58241,0 106.06739,-7.560074 106.06739,-16.883541 0,-9.323466 -47.48498,-16.88354 -106.06739,-16.88354"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6138"
d="m 124.33665,44.291154 c -48.985393,0 -88.704046,3.780037 -88.704046,8.441771 0,4.661733 39.718653,8.44177 88.704046,8.44177 48.99483,0 88.70405,-3.780037 88.70405,-8.44177 0,-4.661734 -39.70922,-8.441771 -88.70405,-8.441771"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6140"
d="m 213.0407,52.54533 0,-46.8987237"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6142"
d="m 230.78151,55.171658 0,-46.8987232"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6144"
d="m 201.71678,17.27749 102.67021,0"
style="fill:none;stroke:#000000;stroke-width:0.31140783px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6146"
d="m 191.14778,16.649047 15.23068,0 c 0.34915,0 0.62281,0.281392 0.62281,0.628443 0,0.34705 -0.27366,0.619063 -0.62281,0.619063 l -15.23068,0 c -0.33971,0 -0.62281,-0.272013 -0.62281,-0.619063 0,-0.347051 0.2831,-0.628443 0.62281,-0.628443 z m 13.96617,-3.123455 7.54928,3.751898 -7.54928,3.751898 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15098561px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6148"
d="m 244.74768,17.896553 -7.67196,0 c -0.34915,0 -0.63225,-0.272013 -0.63225,-0.619063 0,-0.347051 0.2831,-0.628443 0.63225,-0.628443 l 7.67196,0 c 0.34915,0 0.63225,0.281392 0.63225,0.628443 0,0.34705 -0.2831,0.619063 -0.63225,0.619063 z m -6.41689,3.132835 -7.54928,-3.751898 7.54928,-3.751898 z"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15098561px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
id="path6150"
d="m 124.87454,146.34278 c -1.96282,0 -3.5576,1.57579 -3.5576,3.52678 0,1.96037 1.59478,3.53616 3.5576,3.53616 1.96281,0 3.5576,-1.57579 3.5576,-3.53616 0,-1.95099 -1.59479,-3.52678 -3.5576,-3.52678"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
id="path6152"
d="m 124.87454,146.34278 c -1.96282,0 -3.5576,1.57579 -3.5576,3.52678 0,1.96037 1.59478,3.53616 3.5576,3.53616 1.96281,0 3.5576,-1.57579 3.5576,-3.53616 0,-1.95099 -1.59479,-3.52678 -3.5576,-3.52678"
style="fill:none;stroke:#000000;stroke-width:2.07605219px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<text
id="text6154"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="130.56606"
x="135.4341"
xml:space="preserve">Vijm</text>
<text
id="text6156"
style="font-size:13.89067554px;font-style:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#000000;font-family:Calibri"
y="130.56606"
x="161.85658"
xml:space="preserve"> </text>
<path
id="path6158"
d="m 138.89733,178.16825 -6.33196,-11.07748 c -0.16986,-0.30015 -0.0661,-0.67534 0.23591,-0.85356 0.30197,-0.16883 0.68887,-0.0657 0.85873,0.24388 l 6.32253,11.0681 c 0.17929,0.30015 0.066,0.68472 -0.23592,0.85355 -0.30197,0.16884 -0.67943,0.0657 -0.84929,-0.23449 z m -8.44576,-8.44177 -0.45296,-8.37611 7.0114,4.67111 z"
clip-path="url(#clipEmfPath6)"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.15098561px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
sodipodi:type="arc"
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="path5798"
sodipodi:cx="566.625"
sodipodi:cy="95.226433"
sodipodi:rx="19.647192"
sodipodi:ry="18.861303"
d="m 586.27219,95.226433 a 19.647192,18.861303 0 1 1 -39.29438,0 19.647192,18.861303 0 1 1 39.29438,0 z"
transform="matrix(0.66789194,0,0,0.66789194,-253.05765,86.320541)" />
<path
style="fill:none;stroke:#000000;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:none"
d="m 287.63172,175.13347 -143.98334,0 -17.47117,-22.02163"
id="path12357"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
d="M 144.05812,171.12636 132.58853,156.44528"
id="path13497"
inkscape:connector-curvature="0"
transform="translate(-0.905914,3.54832)" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 21 KiB

Some files were not shown because too many files have changed in this diff Show More