diff --git a/src/db/db/dbLayout.h b/src/db/db/dbLayout.h index 13bf6cee6..3d4c269ec 100644 --- a/src/db/db/dbLayout.h +++ b/src/db/db/dbLayout.h @@ -434,7 +434,7 @@ private: }; /** - * @brief An interface that is used to map layer between libraries and PCell's and the layout + * @brief An interface that is used to map layer between libraries and PCells and the layout */ class ImportLayerMapping { @@ -1510,7 +1510,7 @@ public: /** * @brief Gets the guiding shape layer * - * The guiding shape layer is used to store the guiding shapes of PCell's + * The guiding shape layer is used to store the guiding shapes of PCells */ unsigned int guiding_shape_layer () const; diff --git a/src/db/db/dbLibrary.cc b/src/db/db/dbLibrary.cc index 008af5085..45765a6f3 100644 --- a/src/db/db/dbLibrary.cc +++ b/src/db/db/dbLibrary.cc @@ -143,7 +143,7 @@ Library::remap_to (db::Library *other) } // We do PCell resolution before the library proxy resolution. The reason is that - // PCell's may generate library proxies in their instantiation. Hence we must instantiate + // PCells may generate library proxies in their instantiation. Hence we must instantiate // the PCells before we can resolve them. for (std::vector >::const_iterator lp = pcells_to_map.begin (); lp != pcells_to_map.end (); ++lp) { diff --git a/src/db/db/dbPCellDeclaration.h b/src/db/db/dbPCellDeclaration.h index d5ea922ca..e5383c299 100644 --- a/src/db/db/dbPCellDeclaration.h +++ b/src/db/db/dbPCellDeclaration.h @@ -293,9 +293,9 @@ private: }; /** - * @brief A layer declaration for PCell's + * @brief A layer declaration for PCells * - * PCell's must declare the layers it wants to create. + * PCells must declare the layers it wants to create. * Such a layer declaration consists of a db::LayerProperties description (layer, datatype and/or name) * and a symbolic name which can potentially be used as a variable name. */ diff --git a/src/db/db/gsiDeclDbCell.cc b/src/db/db/gsiDeclDbCell.cc index fa1031472..4a25ed7d1 100644 --- a/src/db/db/gsiDeclDbCell.cc +++ b/src/db/db/gsiDeclDbCell.cc @@ -2858,9 +2858,9 @@ Class decl_Cell ("db", "Cell", "this method returns true, if this cell represents a pcell with a distinct\n" "set of parameters (a PCell proxy). This also is true, if the PCell is imported from a library.\n" "\n" - "Technically, PCell's imported from a library are library proxies which are \n" + "Technically, PCells imported from a library are library proxies which are \n" "pointing to PCell variant proxies. This scheme can even proceed over multiple\n" - "indirections, i.e. a library using PCell's from another library.\n" + "indirections, i.e. a library using PCells from another library.\n" "\n" "This method has been introduced in version 0.22.\n" ) + @@ -3011,7 +3011,7 @@ Class decl_Cell ("db", "Cell", gsi::method ("basic_name", &db::Cell::get_basic_name, "@brief Returns the name of the library or PCell or the real name of the cell\n" "For non-proxy cells (see \\is_proxy?), this method simply returns the cell name.\n" - "For proxy cells, this method returns the PCell's definition name or the library\n" + "For proxy cells, this method returns the PCells definition name or the library\n" "cell name. This name may differ from the actual cell's name because to ensure\n" "that cell names are unique, KLayout may assign different names to the actual \n" "cell compared to the source cell.\n" diff --git a/src/db/db/gsiDeclDbLayout.cc b/src/db/db/gsiDeclDbLayout.cc index 2d6df3c87..ab3da0f43 100644 --- a/src/db/db/gsiDeclDbLayout.cc +++ b/src/db/db/gsiDeclDbLayout.cc @@ -1878,7 +1878,7 @@ Class decl_Layout ("db", "Layout", "@return The cell index of the pcell variant proxy cell\n" "This method will create a PCell variant proxy for a local PCell definition.\n" "It will create the PCell variant for the given parameters. Note that this method \n" - "does not allow one to create PCell instances for PCell's located in a library. Use\n" + "does not allow one to create PCell instances for PCells located in a library. Use\n" "\\add_pcell_variant with the library parameter for that purpose.\n" "Unlike the variant using a list of parameters, this version allows specification\n" "of the parameters with a key/value dictionary. The keys are the parameter names\n" @@ -1898,7 +1898,7 @@ Class decl_Layout ("db", "Layout", "@return The cell index of the pcell variant proxy cell\n" "This method will create a PCell variant proxy for a local PCell definition.\n" "It will create the PCell variant for the given parameters. Note that this method \n" - "does not allow one to create PCell instances for PCell's located in a library. Use\n" + "does not allow one to create PCell instances for PCells located in a library. Use\n" "\\add_pcell_variant with the library parameter for that purpose.\n" "\n" "The parameters are a sequence of variants which correspond to the parameters declared " diff --git a/src/edt/edt/edtService.h b/src/edt/edt/edtService.h index b5861407d..0ac8246b8 100644 --- a/src/edt/edt/edtService.h +++ b/src/edt/edt/edtService.h @@ -358,7 +358,7 @@ public: /** * @brief Handle changes in the guiding shapes, i.e. create PCell variants * - * @return true, if PCell's have been updated, indicating that our selection is no longer valid + * @return true, if PCells have been updated, indicating that our selection is no longer valid * * This version assumes there is only one guiding shape selected and will update the selection. * It will also call layout.cleanup() if required. diff --git a/src/lay/lay/doc/about/about_libraries.xml b/src/lay/lay/doc/about/about_libraries.xml index b7cfafcdb..86debab30 100644 --- a/src/lay/lay/doc/about/about_libraries.xml +++ b/src/lay/lay/doc/about/about_libraries.xml @@ -53,7 +53,7 @@
  • Coded libraries: Such libraries are provided by code, either through shared objects/DLL's or through Ruby code. Basically such code has to provide a layout object containing the library cells. - A coded library can also provide PCell's (parametrized cells) as library components. + A coded library can also provide PCells (parametrized cells) as library components. Sell for details about parametrized cells.
    • diff --git a/src/lay/lay/doc/about/about_pcells.xml b/src/lay/lay/doc/about/about_pcells.xml index a8bdad290..8453f32d8 100644 --- a/src/lay/lay/doc/about/about_pcells.xml +++ b/src/lay/lay/doc/about/about_pcells.xml @@ -3,10 +3,10 @@ - About PCell's + About PCells

    - Starting with version 0.22, KLayout offers parametrized cells (PCell's). + Starting with version 0.22, KLayout offers parametrized cells (PCells). PCells are a feature found in other tools to simplify layout by providing generators for common layout building blocks. Parametrized cells do not contain static layout but are created dynamically by code using a given set of parameters. @@ -20,14 +20,14 @@

    Using a PCell is easy: choose the library and the PCell from that library when asked for - the cell in the instance options dialog. For PCell's, KLayout offers an additional + the cell in the instance options dialog. For PCells, KLayout offers an additional parameters page where it asks for the parameter required by the PCell. The placement - of the PCell is done as for simple instances. PCell's offer the same instantiation + of the PCell is done as for simple instances. PCells offer the same instantiation options that normal cells.

    - KLayout provides a simple library called "Basic" with some useful basic PCell's. + KLayout provides a simple library called "Basic" with some useful basic PCells. See for more details about that library.

    @@ -52,13 +52,13 @@

    A PCell implementation consists of at least three parts: a description text, a parameter declaration and a production callback. In addition, a PCell - can provide a method that "fixes" parameters according to the PCell's consistency rules + can provide a method that "fixes" parameters according to the PCells consistency rules (coerce parameters). Technically, a PCell is a class implementing a certain interface with these methods.

    - PCell's are usually packed in libraries. PCell libraries can be provided as + PCells are usually packed in libraries. PCell libraries can be provided as shared objects/DLL's (in C++) or as Ruby scripts. Because PCell code is only executed if required, performance usually is not the main objective. A Ruby implementation will therefore be sufficient in most cases and diff --git a/src/lay/lay/doc/about/basic_lib.xml b/src/lay/lay/doc/about/basic_lib.xml index 2d08969ff..a2592561e 100644 --- a/src/lay/lay/doc/about/basic_lib.xml +++ b/src/lay/lay/doc/about/basic_lib.xml @@ -10,22 +10,22 @@

    The "Basic" library

    - The "Basic" Library provides some useful generic PCell's. + The "Basic" Library provides some useful generic PCells. One use model is to draw a shape and convert the shape to one - of the provided PCell's. This use model is suitable for creating + of the provided PCells. This use model is suitable for creating Circles, Ellipses, Donuts, Texts and rounded and stroked polygons or rounded paths.

    - To use that feature, draw the shape and choose "Convert To PCell's" + To use that feature, draw the shape and choose "Convert To PCells" from the "Edit"/"Selection" menu. A dialog will be shown where the - target PCell can be selected. Only those PCell's supporting that + target PCell can be selected. Only those PCells supporting that shape type will be shown.

    - The "Basic" library provides the following PCell's: + The "Basic" library provides the following PCells:

      @@ -88,7 +88,7 @@

      CIRCLE and ELLIPSE

      -

      These PCell's define a circle and an ellipse. In both cases, the number of interpolation +

      These PCells define a circle and an ellipse. In both cases, the number of interpolation points (per full circle) can be specified. The default is 64 points. A circle features a handle to define the diameter. An ellipse features two handles defining the diameters in x and y direction. @@ -112,7 +112,7 @@

      PIE and ARC

      -

      Both of these PCell's are segments of circles or donuts. The PIE PCell features two handles to +

      Both of these PCells are segments of circles or donuts. The PIE PCell features two handles to define the radius and start and end angle. The ARC PCell also features two handles to define outer and inner radius as well. The following image shows PIE and ARC in action:

      @@ -120,7 +120,7 @@

      -

      Both PCell's do not support conversion of shapes.

      +

      Both PCells do not support conversion of shapes.

      ROUND_PATH

      diff --git a/src/lay/lay/doc/manual/create_instance.xml b/src/lay/lay/doc/manual/create_instance.xml index 610d38303..07f6c6897 100644 --- a/src/lay/lay/doc/manual/create_instance.xml +++ b/src/lay/lay/doc/manual/create_instance.xml @@ -69,7 +69,7 @@

      To learn more about libraries, read . Read - for details about PCell's. + for details about PCells.

      diff --git a/src/lay/lay/doc/manual/pcell_operations.xml b/src/lay/lay/doc/manual/pcell_operations.xml index 952608b1f..f92ca7e0a 100644 --- a/src/lay/lay/doc/manual/pcell_operations.xml +++ b/src/lay/lay/doc/manual/pcell_operations.xml @@ -8,15 +8,15 @@

      - PCell's can be created from shapes if the PCell is derived from a "guiding shape". - Specifically the Basic library PCell's support derivation from guiding shapes with a few + PCells can be created from shapes if the PCell is derived from a "guiding shape". + Specifically the Basic library PCells support derivation from guiding shapes with a few exceptions. So for example, a round-cornered polygon can be created from a normal polygon by selecting the polygons, choosing "Edit/Selection/Convert To PCell" and selecting the "Basic.ROUND_POLYGON" for the PCell.

      - PCell's can be converted to normal cells by choosing "Edit/Cell/Convert Cell To Static" + PCells can be converted to normal cells by choosing "Edit/Cell/Convert Cell To Static" or "Edit/Layout/Convert All Cells To Static". Normal (static) cells can be edited individually but do no longer offer parameters to control the look of the cell.

      diff --git a/src/lay/lay/doc/programming/database_api.xml b/src/lay/lay/doc/programming/database_api.xml index cd4dfc0c8..b7dce4f13 100644 --- a/src/lay/lay/doc/programming/database_api.xml +++ b/src/lay/lay/doc/programming/database_api.xml @@ -321,7 +321,7 @@ lv.remove_unused_layers is a special layer.

      -

      In addition, a layout contains a special layer which is used to implement the "guiding shape" feature of PCell's. +

      In addition, a layout contains a special layer which is used to implement the "guiding shape" feature of PCells. It is a special layer that serves as a container for shapes which parametrize PCells. The index of that layer can be obtained with .

      @@ -523,7 +523,7 @@ shape.set_property(1, "NewValue") API. It represents a cell, which itself is a collection of shapes per layer and instances of other cells. The methods provided by the Cell class deal with either the shape or the instance aspect. A cell is also responsible for handling parts of the PCell scheme, either for - the cell itself (if it is an incarnation of a PCell) or instances of PCell's. + the cell itself (if it is an incarnation of a PCell) or instances of PCells.

      diff --git a/src/lay/lay/doc/programming/python.xml b/src/lay/lay/doc/programming/python.xml index ad2094e66..6eb8449d6 100644 --- a/src/lay/lay/doc/programming/python.xml +++ b/src/lay/lay/doc/programming/python.xml @@ -17,7 +17,7 @@ So it is possible to write one script in Ruby and another one in Python. Just pick your favorite language. Scripts written in different languages share the same KLayout data structures. Naturally they cannot directly share variables or language-specific data. But you can, for example, - implement PCell's in Python and Ruby and use those different PCells in the same layout at the same time. + implement PCells in Python and Ruby and use those different PCells in the same layout at the same time. Depending on the type of PCell, KLayout will either execute Python or Ruby code.

      diff --git a/src/lay/lay/doc/programming/ruby_pcells.xml b/src/lay/lay/doc/programming/ruby_pcells.xml index 59918c91d..caabcf7ac 100644 --- a/src/lay/lay/doc/programming/ruby_pcells.xml +++ b/src/lay/lay/doc/programming/ruby_pcells.xml @@ -3,7 +3,7 @@ - Coding PCell's In Ruby + Coding PCells In Ruby @@ -12,7 +12,7 @@

      - A good starting point for Ruby PCell's is the PCell sample. Create a macro in the + A good starting point for Ruby PCells is the PCell sample. Create a macro in the macro development IDE (use the "+" button) and choose "PCell sample" from the templates.

      @@ -171,7 +171,7 @@ end

      Using the same concept, a library is an object derived from the class. It is basically - a container for PCell's and static layout cells. A library has to be initialized (most conveniently in + a container for PCells and static layout cells. A library has to be initialized (most conveniently in the constructor), registered and initialized once. That makes the library available to the system and it can be used in layouts.

      @@ -420,13 +420,13 @@ end

      Of course, more than one PCell class can be declared. Each PCell type must - have an own implementation class which we will use later to create the PCell's from. + have an own implementation class which we will use later to create the PCells from.

      The Library

      - The library is the container for the PCell's. + The library is the container for the PCells. All important code is packed into the constructor of the library.

      @@ -476,14 +476,14 @@ end

      This line of code will instantiate the library and, through the constructor, instantiate - the PCell's and register the library. We are done now and can use the library and our PCell. + the PCells and register the library. We are done now and can use the library and our PCell.

      Debugging The Code

      When you have modified the code, you need to rerun the script. That will create the classes - again and re-register the PCell's and the Library with the new implementation. PCell's already + again and re-register the PCells and the Library with the new implementation. PCells already living in the layout will be migrated to the new implementation by mapping their parameters by their symbolic names.

      diff --git a/src/lay/lay/salt_templates/tech/tech/tech.lyt b/src/lay/lay/salt_templates/tech/tech/tech.lyt index ac78bda13..b0d1af571 100644 --- a/src/lay/lay/salt_templates/tech/tech/tech.lyt +++ b/src/lay/lay/salt_templates/tech/tech/tech.lyt @@ -4,6 +4,6 @@ 0.001 - + true diff --git a/src/laybasic/laybasic/layLayoutView.h b/src/laybasic/laybasic/layLayoutView.h index 5e92104d4..9dd53e7eb 100644 --- a/src/laybasic/laybasic/layLayoutView.h +++ b/src/laybasic/laybasic/layLayoutView.h @@ -2154,9 +2154,9 @@ public: bool layer_model_updated (); /** - * @brief Get the "select inside PCell's" selection mode + * @brief Get the "select inside PCells" selection mode * - * @return true, objects inside PCell's can be selected + * @return true, objects inside PCells can be selected */ bool select_inside_pcells_mode () const { diff --git a/src/lib/lib/libBasic.cc b/src/lib/lib/libBasic.cc index f7492bf08..40e188c42 100644 --- a/src/lib/lib/libBasic.cc +++ b/src/lib/lib/libBasic.cc @@ -49,7 +49,7 @@ public: set_name ("Basic"); set_description ("Basic layout objects"); - // register all the PCell's: + // register all the PCells: layout ().register_pcell ("TEXT", new BasicText ()); layout ().register_pcell ("CIRCLE", new BasicCircle ()); layout ().register_pcell ("ELLIPSE", new BasicEllipse ()); diff --git a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc index 4a8a40c7d..943da8df8 100644 --- a/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc +++ b/src/plugins/streamers/gds2/db_plugin/dbGDS2ReaderBase.cc @@ -376,7 +376,7 @@ GDS2ReaderBase::do_read (db::Layout &layout) if (cell == 0) { - // ignore everything in proxy cells: these are created from the libraries or PCell's. + // ignore everything in proxy cells: these are created from the libraries or PCells. } else if (rec_id == sPROPATTR) { diff --git a/src/tl/tl/tlVariant.cc b/src/tl/tl/tlVariant.cc index 29e08caa5..515700158 100644 --- a/src/tl/tl/tlVariant.cc +++ b/src/tl/tl/tlVariant.cc @@ -171,7 +171,7 @@ VariantUserClassBase::clear_class_table () std::string VariantUserClassBase::translate_class_name (const std::string &lc_clsname) { - // Note: for pre-0.23 versions to be able to read PCell's generated by 0.23 and further + // Note: for pre-0.23 versions to be able to read PCells generated by 0.23 and further // (see #601), we need to use the old "complex type" names, specifically "layer" instead of "layerinfo". if (lc_clsname == "layerinfo") { return "layer";