diff --git a/bora/src/bora/AnalogDistance.h b/bora/src/bora/AnalogDistance.h index 62bde52e..e29196f6 100644 --- a/bora/src/bora/AnalogDistance.h +++ b/bora/src/bora/AnalogDistance.h @@ -80,7 +80,7 @@ namespace Bora { DbU::Unit AnalogDistance::operator() ( const Vertex* vcurr, const Vertex* vnext, const Edge* e ) const { - cdebug_log(112,1) << "Calcul _distance: "<< _net << endl; + cdebug_log(112,1) << "Calcul _distance: "<< _net << std::endl; DbU::Unit distance = vcurr->getDistance(); DbU::Unit addedDistance = 0; @@ -96,8 +96,8 @@ namespace Bora { Point pneighbour = vcurr->getNextPathPoint ( pcurrent, vnext ); addedDistance = std::abs( pneighbour.getX() - pcurrent.getX()) + std::abs(pneighbour.getY() - pcurrent.getY() ); - cdebug_log(112,0) << "Pcurrent : X:" << DbU::getValueString(pcurrent.getX()) << ", Y:" << DbU::getValueString(pcurrent.getY()) << endl; - cdebug_log(112,0) << "Pneighbour: X:" << DbU::getValueString(pneighbour.getX()) << ", Y:" << DbU::getValueString(pneighbour.getY()) << endl; + cdebug_log(112,0) << "Pcurrent : X:" << DbU::getValueString(pcurrent.getX()) << ", Y:" << DbU::getValueString(pcurrent.getY()) << std::endl; + cdebug_log(112,0) << "Pneighbour: X:" << DbU::getValueString(pneighbour.getX()) << ", Y:" << DbU::getValueString(pneighbour.getY()) << std::endl; addedDistance += addCost(vcurr, vnext, addedDistance); distance += addedDistance; } @@ -111,7 +111,7 @@ namespace Bora { DbU::Unit AnalogDistance::addCost ( const Vertex* vcurr, const Vertex* vnext, DbU::Unit aDistance ) const { cdebug_log(112,1) << "AnalogDistance::addCost(const Vertex* vcurr,const Vertex* vnext): aDistance: " - << DbU::getValueString(aDistance) << endl; + << DbU::getValueString(aDistance) << std::endl; double addedDistance = aDistance; DbU::Unit supDist = 0; @@ -135,40 +135,40 @@ namespace Bora { if (h) { cdebug_log(112,0) << " rp: Horizontal and "; if ( (gcurr->isNorth(gnext)) or (gcurr->isSouth(gnext)) ) { - cdebug_log(112,0) << "COST." << endl; + cdebug_log(112,0) << "COST." << std::endl; supDist += getPenality(addedDistance)*1; } else - cdebug_log(112,0) << "FREE." << endl; + cdebug_log(112,0) << "FREE." << std::endl; } else if (v) { cdebug_log(112,0) << " rp: Vertical and "; if ( (gcurr->isWest(gnext)) or (gcurr->isEast(gnext)) ) { - cdebug_log(112,0) << "COST." << endl; + cdebug_log(112,0) << "COST." << std::endl; supDist += getPenality(addedDistance)*1; } else - cdebug_log(112,0) << "FREE." << endl; + cdebug_log(112,0) << "FREE." << std::endl; } else - cdebug_log(112,0) << "IS UNKNOWN.1" << endl; + cdebug_log(112,0) << "IS UNKNOWN.1" << std::endl; } } else { IntervalC intervfrom = vcurr->getIntervFrom( Vertex::From2Mode ); - cdebug_log(112,0) << "Case: vcurr is NOT a source nor a device " << endl; - cdebug_log(112,0) << "(gprev->isEast (gcurr):" << gprev->isWest (gcurr) << endl; - cdebug_log(112,0) << "(gcurr->isEast (gnext):" << gcurr->isWest (gnext) << endl; - cdebug_log(112,0) << "isXUnion(gprev, gnext):" << isXUnion(gprev, gnext) << endl; - cdebug_log(112,0) << "isYUnion(gprev, gnext):" << isYUnion(gprev, gnext) << endl; + cdebug_log(112,0) << "Case: vcurr is NOT a source nor a device " << std::endl; + cdebug_log(112,0) << "(gprev->isEast (gcurr):" << gprev->isWest (gcurr) << std::endl; + cdebug_log(112,0) << "(gcurr->isEast (gnext):" << gcurr->isWest (gnext) << std::endl; + cdebug_log(112,0) << "isXUnion(gprev, gnext):" << isXUnion(gprev, gnext) << std::endl; + cdebug_log(112,0) << "isYUnion(gprev, gnext):" << isYUnion(gprev, gnext) << std::endl; if (vcurr->areSameSide(vprev,vnext)) { - cdebug_log(112,0) << "Case: Turn around" << endl; + cdebug_log(112,0) << "Case: Turn around" << std::endl; supDist += getPenality(addedDistance)*4; } else if ( ( (gcurr->isNorth(gprev) or gcurr->isSouth(gprev)) and (gcurr->isEast (gnext) or gcurr->isWest (gnext)) ) or ( (gcurr->isEast (gprev) or gcurr->isWest (gprev)) and (gcurr->isNorth(gnext) or gcurr->isSouth(gnext)) ) ) { - cdebug_log(112,0) << "Case: Simple turn" << endl; + cdebug_log(112,0) << "Case: Simple turn" << std::endl; supDist += getPenality( addedDistance ); } else if (vprev->isH()) { - cdebug_log(112,0) << "Case: vprev is horizontal" << endl; + cdebug_log(112,0) << "Case: vprev is horizontal" << std::endl; if ( ( ( (gcurr->isSouth(gprev) and gcurr->isNorth(gnext)) or (gcurr->isNorth(gprev) and gcurr->isSouth(gnext)) ) and (not isXUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)) ) @@ -176,15 +176,15 @@ namespace Bora { or (gcurr->isEast (gprev) and gcurr->isWest (gnext)) ) and ( (intervfrom.getAxis() < gnext->getYMin()) or (intervfrom.getAxis() > gnext->getYMax()) ) ) ) { - cdebug_log(112,0) << "Case: Double turn1" << endl; - cdebug_log(112,0) << "((gcurr->isSouth(gprev)) && (gcurr->isNorth(gnext))) : " << ((gcurr->isSouth(gprev)) && (gcurr->isNorth(gnext))) << endl; - cdebug_log(112,0) << "((gcurr->isNorth(gprev)) && (gcurr->isSouth(gnext))) : " << ((gcurr->isNorth(gprev)) && (gcurr->isSouth(gnext))) << endl; - cdebug_log(112,0) << "(!isXUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)): " << (!isXUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)) << endl; + cdebug_log(112,0) << "Case: Double turn1" << std::endl; + cdebug_log(112,0) << "((gcurr->isSouth(gprev)) && (gcurr->isNorth(gnext))) : " << ((gcurr->isSouth(gprev)) && (gcurr->isNorth(gnext))) << std::endl; + cdebug_log(112,0) << "((gcurr->isNorth(gprev)) && (gcurr->isSouth(gnext))) : " << ((gcurr->isNorth(gprev)) && (gcurr->isSouth(gnext))) << std::endl; + cdebug_log(112,0) << "(!isXUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)): " << (!isXUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)) << std::endl; supDist += getPenality( addedDistance )*1; } else - cdebug_log(112,0) << "Case: No cost" << endl; + cdebug_log(112,0) << "Case: No cost" << std::endl; } else if (vprev->isV()) { - cdebug_log(112,0) << "Case: vprev is vertical" << endl; + cdebug_log(112,0) << "Case: vprev is vertical" << std::endl; if ( ( ( (gcurr->isWest(gprev) and gcurr->isEast (gnext)) or (gcurr->isEast(gprev) and gcurr->isWest (gnext)) ) and (not isYUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)) ) @@ -192,14 +192,14 @@ namespace Bora { or (gcurr->isNorth(gprev) and gcurr->isSouth(gnext)) ) and ( (intervfrom.getAxis() < gnext->getXMin()) or (intervfrom.getAxis() > gnext->getXMax()) ) ) ) { - cdebug_log(112,0) << "Case: Double turn2" << endl; - cdebug_log(112,0) << "((gcurr->isWest(gprev)) && (gcurr->isEast(gnext))) :" << ((gcurr->isWest(gprev)) && (gcurr->isEast(gnext))) << endl; - cdebug_log(112,0) << "((gcurr->isEast(gprev)) && (gcurr->isWest(gnext))) :" << ((gcurr->isEast(gprev)) && (gcurr->isWest(gnext))) << endl; - cdebug_log(112,0) << "(!isYUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)): " << (!isYUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)) << endl; + cdebug_log(112,0) << "Case: Double turn2" << std::endl; + cdebug_log(112,0) << "((gcurr->isWest(gprev)) && (gcurr->isEast(gnext))) :" << ((gcurr->isWest(gprev)) && (gcurr->isEast(gnext))) << std::endl; + cdebug_log(112,0) << "((gcurr->isEast(gprev)) && (gcurr->isWest(gnext))) :" << ((gcurr->isEast(gprev)) && (gcurr->isWest(gnext))) << std::endl; + cdebug_log(112,0) << "(!isYUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)): " << (!isYUnion(intervfrom.getMin(), intervfrom.getMax(), gnext)) << std::endl; supDist += getPenality( addedDistance )*1; } else - cdebug_log(112,0) << "Case: No cost" << endl; - } else cdebug_log(112,0) << "Case: No cost" << endl; + cdebug_log(112,0) << "Case: No cost" << std::endl; + } else cdebug_log(112,0) << "Case: No cost" << std::endl; } // Case: Next is Device, add cost to arrive to RP @@ -215,21 +215,21 @@ namespace Bora { Vertical* v = dynamic_cast( rp->_getEntityAsSegment() ); if (h) { if (gcurr->isNorth(gnext) or gcurr->isSouth(gnext)) { - cdebug_log(112,0) << "COST." << endl; + cdebug_log(112,0) << "COST." << std::endl; supDist += getPenality( addedDistance )*1; } else - cdebug_log(112,0) << "FREE." << endl; + cdebug_log(112,0) << "FREE." << std::endl; } else if (v) { if (gcurr->isWest(gnext) or gcurr->isEast(gnext)) { - cdebug_log(112,0) << "COST." << endl; + cdebug_log(112,0) << "COST." << std::endl; supDist += getPenality( addedDistance )*1; } else - cdebug_log(112,0) << "FREE." << endl; + cdebug_log(112,0) << "FREE." << std::endl; } } } - cdebug_log(112,0) << "supDist = " << DbU::getValueString(supDist) << endl; + cdebug_log(112,0) << "supDist = " << DbU::getValueString(supDist) << std::endl; cdebug_tabw(112,-1); return supDist; diff --git a/crlcore/python/helpers/io.py b/crlcore/python/helpers/io.py index 1a440488..dd2a2eac 100644 --- a/crlcore/python/helpers/io.py +++ b/crlcore/python/helpers/io.py @@ -18,23 +18,46 @@ import os import os.path import re import traceback -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QSizePolicy -from PyQt4.QtGui import QDialog -from PyQt4.QtGui import QPalette -from PyQt4.QtGui import QColor -from PyQt4.QtGui import QFont -from PyQt4.QtGui import QFontMetrics -from PyQt4.QtGui import QWidget -from PyQt4.QtGui import QFrame -from PyQt4.QtGui import QLabel -from PyQt4.QtGui import QPixmap -from PyQt4.QtGui import QPushButton -from PyQt4.QtGui import QTextEdit -from PyQt4.QtGui import QVBoxLayout -from PyQt4.QtGui import QHBoxLayout -from PyQt4.QtGui import QAction -from PyQt4.QtGui import QKeySequence +try: + from PyQt4.QtCore import Qt + from PyQt4.QtGui import QSizePolicy + from PyQt4.QtGui import QDialog + from PyQt4.QtGui import QPalette + from PyQt4.QtGui import QColor + from PyQt4.QtGui import QFont + from PyQt4.QtGui import QFontMetrics + from PyQt4.QtGui import QWidget + from PyQt4.QtGui import QFrame + from PyQt4.QtGui import QLabel + from PyQt4.QtGui import QPixmap + from PyQt4.QtGui import QPushButton + from PyQt4.QtGui import QTextEdit + from PyQt4.QtGui import QVBoxLayout + from PyQt4.QtGui import QHBoxLayout + from PyQt4.QtGui import QAction + from PyQt4.QtGui import QKeySequence +except Exception, e: + try: + from PyQt5.QtCore import Qt + from PyQt5.QtWidgets import QSizePolicy + from PyQt5.QtWidgets import QDialog + from PyQt5.QtGui import QPalette + from PyQt5.QtGui import QColor + from PyQt5.QtGui import QFont + from PyQt5.QtGui import QFontMetrics + from PyQt5.QtWidgets import QWidget + from PyQt5.QtWidgets import QFrame + from PyQt5.QtWidgets import QLabel + from PyQt5.QtGui import QPixmap + from PyQt5.QtWidgets import QPushButton + from PyQt5.QtWidgets import QTextEdit + from PyQt5.QtWidgets import QVBoxLayout + from PyQt5.QtWidgets import QHBoxLayout + from PyQt5.QtWidgets import QAction + from PyQt5.QtGui import QKeySequence + except e: + print '[ERROR] helpers.io, neither PyQt4 nor PyQt5 is available.' + sys.exit( 1 ) import helpers from Hurricane import UpdateSession import Viewer diff --git a/crlcore/src/cyclop/CMakeLists.txt b/crlcore/src/cyclop/CMakeLists.txt index 21b92dfe..9c04318d 100644 --- a/crlcore/src/cyclop/CMakeLists.txt +++ b/crlcore/src/cyclop/CMakeLists.txt @@ -21,9 +21,9 @@ link_directories ( ${CRLCORE_BINARY_DIR}/src/ccore ) - if(NOT WITH_QT5) +#if(NOT WITH_QT5) list ( APPEND cpps ${mocCpps} ) - endif() +#endif() add_executable ( cyclop ${cpps} ) target_link_libraries ( cyclop crlcore diff --git a/cumulus/src/plugins/AboutWindow.py b/cumulus/src/plugins/AboutWindow.py index 04760cf1..55995831 100644 --- a/cumulus/src/plugins/AboutWindow.py +++ b/cumulus/src/plugins/AboutWindow.py @@ -18,19 +18,38 @@ try: import sys import traceback - from PyQt4.QtCore import Qt - from PyQt4.QtCore import QEventLoop - from PyQt4.QtGui import QDialog - from PyQt4.QtGui import QPalette - from PyQt4.QtGui import QColor - from PyQt4.QtGui import QFont - from PyQt4.QtGui import QWidget - from PyQt4.QtGui import QFrame - from PyQt4.QtGui import QLabel - from PyQt4.QtGui import QVBoxLayout - from PyQt4.QtGui import QAction - from PyQt4.QtGui import QKeySequence - from PyQt4.QtGui import QApplication + try: + from PyQt4.QtCore import Qt + from PyQt4.QtCore import QEventLoop + from PyQt4.QtGui import QDialog + from PyQt4.QtGui import QPalette + from PyQt4.QtGui import QColor + from PyQt4.QtGui import QFont + from PyQt4.QtGui import QWidget + from PyQt4.QtGui import QFrame + from PyQt4.QtGui import QLabel + from PyQt4.QtGui import QVBoxLayout + from PyQt4.QtGui import QAction + from PyQt4.QtGui import QKeySequence + from PyQt4.QtGui import QApplication + except: + try: + from PyQt5.QtCore import Qt + from PyQt5.QtCore import QEventLoop + from PyQt5.QtWidgets import QDialog + from PyQt5.QtGui import QPalette + from PyQt5.QtGui import QColor + from PyQt5.QtGui import QFont + from PyQt5.QtWidgets import QWidget + from PyQt5.QtWidgets import QFrame + from PyQt5.QtWidgets import QLabel + from PyQt5.QtWidgets import QVBoxLayout + from PyQt5.QtWidgets import QAction + from PyQt5.QtGui import QKeySequence + from PyQt5.QtWidgets import QApplication + except: + print '[ERROR] AboutWindow: Neither PyQt4 nor PyQt5 is available.' + sys.exit( 1 ) import Viewer import helpers from helpers.io import ErrorMessage diff --git a/documentation/PythonCpp/PythonCpp.pdf b/documentation/PythonCpp/PythonCpp.pdf index 356467c8..efee6f3f 100644 Binary files a/documentation/PythonCpp/PythonCpp.pdf and b/documentation/PythonCpp/PythonCpp.pdf differ diff --git a/documentation/PythonTutorial/PythonTutorial.pdf b/documentation/PythonTutorial/PythonTutorial.pdf index ec7bb376..a642874d 100644 Binary files a/documentation/PythonTutorial/PythonTutorial.pdf and b/documentation/PythonTutorial/PythonTutorial.pdf differ diff --git a/documentation/RDS/RDS.pdf b/documentation/RDS/RDS.pdf index abd499f3..e7eee92c 100644 Binary files a/documentation/RDS/RDS.pdf and b/documentation/RDS/RDS.pdf differ diff --git a/documentation/Stratus/Stratus.pdf b/documentation/Stratus/Stratus.pdf index bb72b8eb..f83cd31b 100644 Binary files a/documentation/Stratus/Stratus.pdf and b/documentation/Stratus/Stratus.pdf differ diff --git a/documentation/UsersGuide/Installation.rst b/documentation/UsersGuide/Installation.rst index e7ee00a7..03303e92 100644 --- a/documentation/UsersGuide/Installation.rst +++ b/documentation/UsersGuide/Installation.rst @@ -32,7 +32,7 @@ Main building prerequisites: * yacc & lex * Qt 4 or Qt 5 * PyQt 4 or PyQt 5 -* Qwt +* Qwt 6 Building documentation prerequisites: @@ -48,6 +48,29 @@ The following libraries get directly bundled with |Coriolis|: For other distributions, refer to their own packaging system. +Cross Dependencies Issues +~~~~~~~~~~~~~~~~~~~~~~~~~ + +There is a difficult tangle of dependencies between |Python|, |Qt|, |Qwt| and |PyQt|, +the requirements are: + +* A |Python| 2.7. +* |Qt|, either 4 or 5. +* |Qwt| version 6, compiled against the relevant |Qt| version. +* |PyQt|, version 4 or 5, according to the choosen |Qt|. + +Problems arise because: + +* Under |RHEL| 7 or clones, there is no compatible |PyQt5| build compatible with their + |Qt| 5 version (we fall short of one minor, they provides |Qt| 5.9 were we need at + least |Qt| 5.10). So we have to stick to |Qt| 4 on those platforms. + + Fortunately we can build a |Qwt| 6 with |Qt| 4. + +* Under |Debian| or |Ubuntu| there is no |Qwt| 6 build against |Qt| 4, so we have to + use |Qt| 5 and |PyQt| 5. + + Fixed Directory Tree ~~~~~~~~~~~~~~~~~~~~ @@ -58,6 +81,8 @@ building it (note :fboxtt:`~/` or :fboxtt:`$HOME/`). Only the source directory needs to be manually created by the user, all others will be automatically created either by |ccb| or the build system. +|newpage| + +--------------------------------------------------------------------------------------------------------------+ | **Sources** | +------------------------------+-------------------------------------------------------------------------------+ @@ -114,12 +139,6 @@ The |Coriolis| |git| repository is https://www-soc.lip6.fr/git/coriolis.git Again, the **devel_anabatic** branch is now closed. Please revert to **devel** or **master**. -.. note:: - As it is now possible to mix |PyQt| widget with |Coriolis| ones, it is simpler - for us to revert to |Qt| 4 only. Our reference |OS| being |RHEL| 7, there is no - compatible |PyQt5| build compatible with their |Qt| 5 version (we fall short of - one minor, they provides |Qt| 5.9 were we need at least |Qt| 5.10). - .. note:: Under |RHEL| 7 or clones, they upgraded their version of |Qt| 4 (from 4.6 to 4.8) so the *diagonal line* bug no longer occurs. So we can safely use the default @@ -244,8 +263,6 @@ As |cgt| is a |Python| script, the right command to run |gdb| is: :: .. Be aware that it may require newer versions of the dependencies and may introduce .. incompatibilities with the stable version. -|newpage| - Installing on |Debian| 9, |Ubuntu| 18 or compatible distributions ----------------------------------------------------------------- @@ -256,8 +273,8 @@ First, install or check that the required prerequisites are installed : :: git cmake bison flex gcc python-dev \ libboost-all-dev libboost-python-dev \ libbz2-dev libxml2-dev rapidjson-dev libbz2-dev \ - qt4-dev-tools libqwt5-qt4-dev \ # Qt 4 qtbase5-dev libqt5svg5-dev libqwt-qt5-dev \ # Qt 5 + python-pyqt5 \ doxygen dvipng graphviz python-sphinx \ texlive-fonts-extra texlive-lang-french @@ -271,7 +288,7 @@ Third and final step, build & install: :: dummy@lepka:src> cd coriolis dummy@lepka:coriolis> git checkout devel - dummy@lepka:coriolis> ./bootstrap/ccb.py --project=coriolis \ + dummy@lepka:coriolis> ./bootstrap/ccb.py --project=coriolis --qt5 \ --make="-j4 install" diff --git a/documentation/UsersGuide/UsersGuide.pdf b/documentation/UsersGuide/UsersGuide.pdf index 6db1163d..9107d351 100644 Binary files a/documentation/UsersGuide/UsersGuide.pdf and b/documentation/UsersGuide/UsersGuide.pdf differ diff --git a/documentation/UsersGuide/images/Coriolis-logo.fig b/documentation/UsersGuide/images/Coriolis-logo.fig new file mode 100644 index 00000000..92a5da03 --- /dev/null +++ b/documentation/UsersGuide/images/Coriolis-logo.fig @@ -0,0 +1,24 @@ +#FIG 3.2 Produced by xfig version 3.2.7a +Landscape +Center +Metric +A4 +100.00 +Single +-2 +1200 2 +2 1 0 6 0 7 50 -1 -1 0.000 0 2 -1 0 0 2 + 3510 1080 3690 1080 +2 1 0 6 0 7 50 -1 -1 0.000 0 2 -1 0 0 2 + 3330 1350 3330 1170 +2 2 0 6 0 7 50 -1 -1 0.000 0 2 -1 0 0 5 + 3420 1170 3690 1170 3690 1440 3420 1440 3420 1170 +2 1 0 6 0 7 50 -1 -1 0.000 0 2 -1 0 0 2 + 3780 1440 3780 1260 +2 1 0 6 0 7 50 -1 -1 0.000 0 2 -1 0 0 2 + 3420 1530 3600 1530 +2 1 0 3 0 7 50 -1 -1 0.000 0 2 -1 0 0 2 + 3960 900 3960 1710 +2 2 0 3 0 7 50 -1 -1 0.000 0 2 -1 0 0 5 + 3150 900 6570 900 6570 1710 3150 1710 3150 900 +4 0 0 50 -1 18 36 0.0000 4 465 2250 4140 1530 Coriolis\001 diff --git a/documentation/UsersGuide/images/Coriolis-logo.png b/documentation/UsersGuide/images/Coriolis-logo.png new file mode 100644 index 00000000..5c52d9b7 Binary files /dev/null and b/documentation/UsersGuide/images/Coriolis-logo.png differ diff --git a/documentation/_build/doctrees/Analog/Analog.doctree b/documentation/_build/doctrees/Analog/Analog.doctree index 608e4d45..b7b56913 100644 Binary files a/documentation/_build/doctrees/Analog/Analog.doctree and b/documentation/_build/doctrees/Analog/Analog.doctree differ diff --git a/documentation/_build/doctrees/CrlCore/CrlCore.doctree b/documentation/_build/doctrees/CrlCore/CrlCore.doctree index 07d9de33..28d2850b 100644 Binary files a/documentation/_build/doctrees/CrlCore/CrlCore.doctree and b/documentation/_build/doctrees/CrlCore/CrlCore.doctree differ diff --git a/documentation/_build/doctrees/Hurricane/Hurricane.doctree b/documentation/_build/doctrees/Hurricane/Hurricane.doctree index 1743e002..ef5c983a 100644 Binary files a/documentation/_build/doctrees/Hurricane/Hurricane.doctree and b/documentation/_build/doctrees/Hurricane/Hurricane.doctree differ diff --git a/documentation/_build/doctrees/Katabatic/Katabatic.doctree b/documentation/_build/doctrees/Katabatic/Katabatic.doctree index 2da04fbf..bf1cb88b 100644 Binary files a/documentation/_build/doctrees/Katabatic/Katabatic.doctree and b/documentation/_build/doctrees/Katabatic/Katabatic.doctree differ diff --git a/documentation/_build/doctrees/Kite/Kite.doctree b/documentation/_build/doctrees/Kite/Kite.doctree index e85a62f4..ffa2e6f7 100644 Binary files a/documentation/_build/doctrees/Kite/Kite.doctree and b/documentation/_build/doctrees/Kite/Kite.doctree differ diff --git a/documentation/_build/doctrees/Oroshi/Oroshi.doctree b/documentation/_build/doctrees/Oroshi/Oroshi.doctree index 52400fce..cd37e33f 100644 Binary files a/documentation/_build/doctrees/Oroshi/Oroshi.doctree and b/documentation/_build/doctrees/Oroshi/Oroshi.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/Configuration.doctree b/documentation/_build/doctrees/PythonCpp/Configuration.doctree index 3cd97dd4..3b611b12 100644 Binary files a/documentation/_build/doctrees/PythonCpp/Configuration.doctree and b/documentation/_build/doctrees/PythonCpp/Configuration.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/DBoHierarchy.doctree b/documentation/_build/doctrees/PythonCpp/DBoHierarchy.doctree index 72fae864..64d36194 100644 Binary files a/documentation/_build/doctrees/PythonCpp/DBoHierarchy.doctree and b/documentation/_build/doctrees/PythonCpp/DBoHierarchy.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/DBoStandalone.doctree b/documentation/_build/doctrees/PythonCpp/DBoStandalone.doctree index 5df1c220..2bef33b1 100644 Binary files a/documentation/_build/doctrees/PythonCpp/DBoStandalone.doctree and b/documentation/_build/doctrees/PythonCpp/DBoStandalone.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/DbU.doctree b/documentation/_build/doctrees/PythonCpp/DbU.doctree index 72669fef..cc824d5e 100644 Binary files a/documentation/_build/doctrees/PythonCpp/DbU.doctree and b/documentation/_build/doctrees/PythonCpp/DbU.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/Introduction.doctree b/documentation/_build/doctrees/PythonCpp/Introduction.doctree index 060988de..b651da13 100644 Binary files a/documentation/_build/doctrees/PythonCpp/Introduction.doctree and b/documentation/_build/doctrees/PythonCpp/Introduction.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/Name.doctree b/documentation/_build/doctrees/PythonCpp/Name.doctree index 6f809f20..aa32162a 100644 Binary files a/documentation/_build/doctrees/PythonCpp/Name.doctree and b/documentation/_build/doctrees/PythonCpp/Name.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/NonDBo.doctree b/documentation/_build/doctrees/PythonCpp/NonDBo.doctree index a2b1d507..ef3b47d9 100644 Binary files a/documentation/_build/doctrees/PythonCpp/NonDBo.doctree and b/documentation/_build/doctrees/PythonCpp/NonDBo.doctree differ diff --git a/documentation/_build/doctrees/PythonCpp/index.doctree b/documentation/_build/doctrees/PythonCpp/index.doctree index 0ea992a2..f92cd4b5 100644 Binary files a/documentation/_build/doctrees/PythonCpp/index.doctree and b/documentation/_build/doctrees/PythonCpp/index.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/AdvancedTopics.doctree b/documentation/_build/doctrees/PythonTutorial/AdvancedTopics.doctree index 46e29599..246d3d06 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/AdvancedTopics.doctree and b/documentation/_build/doctrees/PythonTutorial/AdvancedTopics.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/CellNetComponent.doctree b/documentation/_build/doctrees/PythonTutorial/CellNetComponent.doctree index 349cfe17..96c22c73 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/CellNetComponent.doctree and b/documentation/_build/doctrees/PythonTutorial/CellNetComponent.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/CgtScript.doctree b/documentation/_build/doctrees/PythonTutorial/CgtScript.doctree index d32db349..d79bd978 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/CgtScript.doctree and b/documentation/_build/doctrees/PythonTutorial/CgtScript.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/Collections.doctree b/documentation/_build/doctrees/PythonTutorial/Collections.doctree index 1b2058ae..777bc497 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/Collections.doctree and b/documentation/_build/doctrees/PythonTutorial/Collections.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/Environment.doctree b/documentation/_build/doctrees/PythonTutorial/Environment.doctree index 144a7c89..16a06806 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/Environment.doctree and b/documentation/_build/doctrees/PythonTutorial/Environment.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/Introduction.doctree b/documentation/_build/doctrees/PythonTutorial/Introduction.doctree index b83692a8..077e6fe6 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/Introduction.doctree and b/documentation/_build/doctrees/PythonTutorial/Introduction.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/Netlist.doctree b/documentation/_build/doctrees/PythonTutorial/Netlist.doctree index a30d4ccf..df1c87da 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/Netlist.doctree and b/documentation/_build/doctrees/PythonTutorial/Netlist.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/RealDesigns.doctree b/documentation/_build/doctrees/PythonTutorial/RealDesigns.doctree index 843f6608..9f35a540 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/RealDesigns.doctree and b/documentation/_build/doctrees/PythonTutorial/RealDesigns.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/ToolEngines.doctree b/documentation/_build/doctrees/PythonTutorial/ToolEngines.doctree index 3dbb35f0..00b6adde 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/ToolEngines.doctree and b/documentation/_build/doctrees/PythonTutorial/ToolEngines.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/index.doctree b/documentation/_build/doctrees/PythonTutorial/index.doctree index 9695a421..f1bf3d6e 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/index.doctree and b/documentation/_build/doctrees/PythonTutorial/index.doctree differ diff --git a/documentation/_build/doctrees/PythonTutorial/pdfHeader.doctree b/documentation/_build/doctrees/PythonTutorial/pdfHeader.doctree index 93d8fa9f..f1a83806 100644 Binary files a/documentation/_build/doctrees/PythonTutorial/pdfHeader.doctree and b/documentation/_build/doctrees/PythonTutorial/pdfHeader.doctree differ diff --git a/documentation/_build/doctrees/RDS/RDSpage.doctree b/documentation/_build/doctrees/RDS/RDSpage.doctree index 6cfb2edb..a18c0936 100644 Binary files a/documentation/_build/doctrees/RDS/RDSpage.doctree and b/documentation/_build/doctrees/RDS/RDSpage.doctree differ diff --git a/documentation/_build/doctrees/RDS/index.doctree b/documentation/_build/doctrees/RDS/index.doctree index 05ffcc01..239c441f 100644 Binary files a/documentation/_build/doctrees/RDS/index.doctree and b/documentation/_build/doctrees/RDS/index.doctree differ diff --git a/documentation/_build/doctrees/Stratus/index.doctree b/documentation/_build/doctrees/Stratus/index.doctree index a81429dc..29c1e780 100644 Binary files a/documentation/_build/doctrees/Stratus/index.doctree and b/documentation/_build/doctrees/Stratus/index.doctree differ diff --git a/documentation/_build/doctrees/Unicorn/Unicorn.doctree b/documentation/_build/doctrees/Unicorn/Unicorn.doctree index 4beb6ed7..6f8972b0 100644 Binary files a/documentation/_build/doctrees/Unicorn/Unicorn.doctree and b/documentation/_build/doctrees/Unicorn/Unicorn.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/Configuration.doctree b/documentation/_build/doctrees/UsersGuide/Configuration.doctree index 3da6ef11..bfa5d8bd 100644 Binary files a/documentation/_build/doctrees/UsersGuide/Configuration.doctree and b/documentation/_build/doctrees/UsersGuide/Configuration.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/DesignFlow.doctree b/documentation/_build/doctrees/UsersGuide/DesignFlow.doctree index 57b4c297..60f8fd29 100644 Binary files a/documentation/_build/doctrees/UsersGuide/DesignFlow.doctree and b/documentation/_build/doctrees/UsersGuide/DesignFlow.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/Installation.doctree b/documentation/_build/doctrees/UsersGuide/Installation.doctree index 707fdcd5..6d5d1775 100644 Binary files a/documentation/_build/doctrees/UsersGuide/Installation.doctree and b/documentation/_build/doctrees/UsersGuide/Installation.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/LicenseCredits.doctree b/documentation/_build/doctrees/UsersGuide/LicenseCredits.doctree index be50f29c..d0d0b1d4 100644 Binary files a/documentation/_build/doctrees/UsersGuide/LicenseCredits.doctree and b/documentation/_build/doctrees/UsersGuide/LicenseCredits.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/Releases.doctree b/documentation/_build/doctrees/UsersGuide/Releases.doctree index c9681634..d76acf76 100644 Binary files a/documentation/_build/doctrees/UsersGuide/Releases.doctree and b/documentation/_build/doctrees/UsersGuide/Releases.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/ScriptsPlugins.doctree b/documentation/_build/doctrees/UsersGuide/ScriptsPlugins.doctree index 627b034b..8f29ca3d 100644 Binary files a/documentation/_build/doctrees/UsersGuide/ScriptsPlugins.doctree and b/documentation/_build/doctrees/UsersGuide/ScriptsPlugins.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/ViewerTools.doctree b/documentation/_build/doctrees/UsersGuide/ViewerTools.doctree index a60b6d66..d8e44b12 100644 Binary files a/documentation/_build/doctrees/UsersGuide/ViewerTools.doctree and b/documentation/_build/doctrees/UsersGuide/ViewerTools.doctree differ diff --git a/documentation/_build/doctrees/UsersGuide/index.doctree b/documentation/_build/doctrees/UsersGuide/index.doctree index 811b6f2b..c131f5a8 100644 Binary files a/documentation/_build/doctrees/UsersGuide/index.doctree and b/documentation/_build/doctrees/UsersGuide/index.doctree differ diff --git a/documentation/_build/doctrees/Viewer/Viewer.doctree b/documentation/_build/doctrees/Viewer/Viewer.doctree index 7dfec7eb..c0117cc1 100644 Binary files a/documentation/_build/doctrees/Viewer/Viewer.doctree and b/documentation/_build/doctrees/Viewer/Viewer.doctree differ diff --git a/documentation/_build/doctrees/defapi/defapi.doctree b/documentation/_build/doctrees/defapi/defapi.doctree index 125e8b6a..42243118 100644 Binary files a/documentation/_build/doctrees/defapi/defapi.doctree and b/documentation/_build/doctrees/defapi/defapi.doctree differ diff --git a/documentation/_build/doctrees/environment.pickle b/documentation/_build/doctrees/environment.pickle index b0b31182..cfb943ee 100644 Binary files a/documentation/_build/doctrees/environment.pickle and b/documentation/_build/doctrees/environment.pickle differ diff --git a/documentation/_build/doctrees/etc/definitions.doctree b/documentation/_build/doctrees/etc/definitions.doctree index d575351f..1484e094 100644 Binary files a/documentation/_build/doctrees/etc/definitions.doctree and b/documentation/_build/doctrees/etc/definitions.doctree differ diff --git a/documentation/_build/doctrees/lefapi/lefapi.doctree b/documentation/_build/doctrees/lefapi/lefapi.doctree index 405d8248..7d691d38 100644 Binary files a/documentation/_build/doctrees/lefapi/lefapi.doctree and b/documentation/_build/doctrees/lefapi/lefapi.doctree differ diff --git a/documentation/_build/doctrees/lefdef/lefdef.doctree b/documentation/_build/doctrees/lefdef/lefdef.doctree index 1f083603..74694e26 100644 Binary files a/documentation/_build/doctrees/lefdef/lefdef.doctree and b/documentation/_build/doctrees/lefdef/lefdef.doctree differ diff --git a/documentation/_build/html/Analog/Analog.html b/documentation/_build/html/Analog/Analog.html index 1329c8b6..27f93390 100644 --- a/documentation/_build/html/Analog/Analog.html +++ b/documentation/_build/html/Analog/Analog.html @@ -90,6 +90,7 @@
  • Complete Design Flow & Examples
  • Installation