Collaborate, Compare and Merge Panel

The Collaborate, Compare and Merge panel

The Collaborate, Compare and Merge panel is command-central for performing a copper comparison between two versions of the same PCB design. It requires that the board is currently under version control and that the repository that it is stored in is configured in the Data Management - Design Repositories page of the Preferences dialog. The panel checks if the board is the latest revision (known as the Head revision). If it is not, it indicates what must be done to bring it up to date.

The board is divided into cells in the Difference Map. When you click on a cell the differences in that cell are detailed in the lower section of the panel, and also in the main workspace. The Difference Map also includes Layer tabs, use these to examine the differences on each layer.

Panel Access

• To display the panel, click the Panels button at the bottom-right of the workspace when the PCB Editor is active and select the Collaborate, Compare and Merge entry from the pop-up menu.
• You can also access the panel through the View » Panels » Collaborate, Compare and Merge command.

Terminology and Status Messages

Settings Region

• Cell Size - displays the cell size when performing comparisons. Use the drop-down to select the desired size.
• Include Polygon Pours in Comparison - enable to include polygon pours when performing comparisons.
• Show Differences - enable to show differences.

Actions Region

When you click on a command in this region of the panel to initiate a Comparison, the software compares your file against the latest revision in the repository and displays the differences in the Difference Map region of the panel, as well as in the main editing workspace.

The Actions section of the panel is used for the following:

• To display, define and clear Progress Regions in the main workspace.
• To indicate if the board is up-to-date with the repository, define what must be done if it is not, and to initiate Compare and Merge actions.

Version Control Status

When the panel is opened, the software automatically checks the revision number of your board and compares it to the revision number of the Head revision. If they are not the same, the Version control status will indicate what needs to be done to make them the same.

Difference Map Region

When a comparison is performed, the board is divided into cells (the cell size is defined at the top of the panel in the Settings region). The Difference Map presents these cells in a checkerboard fashion. As you hover the cursor over a cell, its cell reference is displayed, such as G4. Click on a cell to display that cell in the main editing window.

Cells that contain differences are shaded in color, the choice of color reflecting ownership of those changes as defined in the color key just below the map of the board. Clicking on a colored cell details all the differences in the Differences section at the bottom of the panel.

• Layer tabs - select the desired layer to examine the differences on a specific layer.
• Previous Unchecked / Next Unchecked - use to move backward or forward through the cells in a logical pattern, layer by layer.
• Set Checked / Clear Checked - use to set or clear the checked differences.

Differences Details Region

The region at the bottom of the panel displays the Difference and Type of difference detected in the currently selected cell. 

Supported Objects

When working in Collaborative PCB Design, some objects/features are not supported by the merge process. Supported/not supported objects are detailed below.

Supported:

• Tracks
• Arcs
• Fills
• Solid Regions
• Pads
• Vias (also Blind & Buried)
• Dimensions
• Coordinates
• Components

Not supported:

• Polygon + cutout + board cutout
• Embedded board array
• Rooms
• Origin
• Grid
• Free 3D Bodies
• Guides
• Rules