Skip to content
Snippets Groups Projects

Remove ModelEntityItem.

Merged David Thompson requested to merge dcthomp/smtk:more-qt-items-20180404 into master

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Author Maintainer

    Do: test

  • Errors:

    • commit f1048cbc cannot be merged; it is marked as a work-in-progress (WIP).

    • commit f1048cbc is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTriangulateFaces.cxx, smtk/extension/remus/MeshOperation.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 8789c277 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 8789c277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/cgm/operators/BooleanSubtraction.cxx, smtk/bridge/discrete/operators/CreateEdgesOperation.cxx, smtk/bridge/discrete/operators/EdgeOperation.cxx, smtk/bridge/discrete/operators/EntityGroupOperation.cxx, smtk/bridge/discrete/operators/GrowOperation.cxx, and 5 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 4d636f86 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 4d636f86 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/discrete/operators/RemoveModel.cxx, smtk/bridge/discrete/operators/SetProperty.cxx, smtk/extension/vtk/operators/ExportEdgesToVTK.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 50e2044a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 50e2044a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/polygon/Operation.txx, smtk/bridge/polygon/operators/CleanGeometry.cxx, smtk/bridge/polygon/operators/CreateEdge.cxx, smtk/bridge/polygon/operators/CreateEdgeFromVertices.cxx, smtk/bridge/polygon/operators/CreateVertices.cxx, and 2 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c050ac2a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit c050ac2a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.h, smtk/model/operators/AssignColors.cxx, smtk/model/operators/CreateInstances.cxx, smtk/model/operators/ExportModelJSON.cxx, smtk/model/operators/GroupAuxiliaryGeometry.cxx, smtk/model/operators/SetProperty.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 7fb754fd is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/json/jsonReferenceItem.cxx, smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit a1b73b4e adds bad whitespace:

      smtk/attribute/testing/cxx/unitJsonItems.cxx:98: tab in indent.
      +	// ReferenceItemDefinition
      smtk/attribute/testing/cxx/unitJsonItems.cxx:175: tab in indent.
      +		if (val) { free(val); }
      smtk/attribute/testing/cxx/unitJsonItems.cxx:176: tab in indent.
      +		dataArgs.pop_back();
      smtk/attribute/testing/cxx/unitJsonItems.cxx:177: tab in indent.
      +	}
    • commit a1b73b4e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 019ca41f is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/attribute/json/jsonComponentItem.cxx, smtk/attribute/json/jsonComponentItem.h, smtk/attribute/json/jsonDoubleItem.cxx, and 17 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit f4787038 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV1Parser.cxx, smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlV3StringWriter.cxx, smtk/io/XmlV3StringWriter.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 3ab44107 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlDocV3Parser.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit e33a314b is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItemDefinition.cxx, smtk/attribute/ResourceItem.h, smtk/io/XmlDocV1Parser.cxx, and 4 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 0b362d65 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ComponentItem.h, smtk/attribute/ResourceItem.h, smtk/operation/groups/ImporterGroup.cxx, smtk/operation/groups/ReaderGroup.cxx, smtk/operation/groups/ResourceIOGroup.cxx, smtk/operation/groups/WriterGroup.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c62cd277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtComponentItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • the merge request is marked as a work-in-progress.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: c0ce1844

  • David Thompson added 4 commits

    added 4 commits

    • 81b63c7f - WIP: Remove ModelEntityItem as much as possible.
    • 4178302c - Eliminate warnings.
    • 5e905f0d - WIP: Remove ModelEntityItem as much as possible.
    • 22c71454 - WIP: Remove ModelEntityItem as much as possible.

    Compare with previous version

  • Author Maintainer

    Do: test

  • Errors:

    • commit 22c71454 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 22c71454 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/io/XmlDocV3Parser.cxx, smtk/mesh/testing/cxx/TestElevateMeshOnStructuredGrid.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 5e905f0d cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 5e905f0d is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/mesh/testing/cxx/TestElevateMesh.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 4178302c is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV3Parser.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 81b63c7f cannot be merged; it is marked as a work-in-progress (WIP).

    • commit f1048cbc cannot be merged; it is marked as a work-in-progress (WIP).

    • commit f1048cbc is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTriangulateFaces.cxx, smtk/extension/remus/MeshOperation.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 8789c277 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 8789c277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/cgm/operators/BooleanSubtraction.cxx, smtk/bridge/discrete/operators/CreateEdgesOperation.cxx, smtk/bridge/discrete/operators/EdgeOperation.cxx, smtk/bridge/discrete/operators/EntityGroupOperation.cxx, smtk/bridge/discrete/operators/GrowOperation.cxx, and 5 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 4d636f86 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 4d636f86 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/discrete/operators/RemoveModel.cxx, smtk/bridge/discrete/operators/SetProperty.cxx, smtk/extension/vtk/operators/ExportEdgesToVTK.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 50e2044a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 50e2044a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/polygon/Operation.txx, smtk/bridge/polygon/operators/CleanGeometry.cxx, smtk/bridge/polygon/operators/CreateEdge.cxx, smtk/bridge/polygon/operators/CreateEdgeFromVertices.cxx, smtk/bridge/polygon/operators/CreateVertices.cxx, and 2 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c050ac2a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit c050ac2a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.h, smtk/model/operators/AssignColors.cxx, smtk/model/operators/CreateInstances.cxx, smtk/model/operators/ExportModelJSON.cxx, smtk/model/operators/GroupAuxiliaryGeometry.cxx, smtk/model/operators/SetProperty.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 7fb754fd is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/json/jsonReferenceItem.cxx, smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit a1b73b4e adds bad whitespace:

      smtk/attribute/testing/cxx/unitJsonItems.cxx:98: tab in indent.
      +	// ReferenceItemDefinition
      smtk/attribute/testing/cxx/unitJsonItems.cxx:175: tab in indent.
      +		if (val) { free(val); }
      smtk/attribute/testing/cxx/unitJsonItems.cxx:176: tab in indent.
      +		dataArgs.pop_back();
      smtk/attribute/testing/cxx/unitJsonItems.cxx:177: tab in indent.
      +	}
    • commit a1b73b4e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 019ca41f is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/attribute/json/jsonComponentItem.cxx, smtk/attribute/json/jsonComponentItem.h, smtk/attribute/json/jsonDoubleItem.cxx, and 17 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit f4787038 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV1Parser.cxx, smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlV3StringWriter.cxx, smtk/io/XmlV3StringWriter.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 3ab44107 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlDocV3Parser.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit e33a314b is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItemDefinition.cxx, smtk/attribute/ResourceItem.h, smtk/io/XmlDocV1Parser.cxx, and 4 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 0b362d65 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ComponentItem.h, smtk/attribute/ResourceItem.h, smtk/operation/groups/ImporterGroup.cxx, smtk/operation/groups/ReaderGroup.cxx, smtk/operation/groups/ResourceIOGroup.cxx, smtk/operation/groups/WriterGroup.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c62cd277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtComponentItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • the merge request is marked as a work-in-progress.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 22c71454

  • David Thompson added 2 commits

    added 2 commits

    • 190a544b - WIP: Remove ModelEntityItem as much as possible.
    • 207aee2e - WIP: Remove ModelEntityItem as much as possible.

    Compare with previous version

  • David Thompson added 1 commit

    added 1 commit

    • 87151f10 - WIP: Use environment so test does not fail.

    Compare with previous version

  • Errors:

    • commit 207aee2e cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 207aee2e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/bridge/discrete/operators/EntityGroupOperation.cxx, smtk/bridge/discrete/operators/MergeOperation.cxx, smtk/bridge/discrete/operators/SplitFaceOperation.cxx, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/bridge/polygon/testing/cxx/UnitTestPolygonFindOperationAttItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 190a544b cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 190a544b is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/testing/cxx/unitJsonItems.cxx, smtk/extension/delaunay/operators/TessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTriangulateFaces.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 22c71454 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 22c71454 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/io/XmlDocV3Parser.cxx, smtk/mesh/testing/cxx/TestElevateMeshOnStructuredGrid.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 5e905f0d cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 5e905f0d is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/mesh/testing/cxx/TestElevateMesh.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 4178302c is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV3Parser.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 81b63c7f cannot be merged; it is marked as a work-in-progress (WIP).

    • commit f1048cbc cannot be merged; it is marked as a work-in-progress (WIP).

    • commit f1048cbc is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTriangulateFaces.cxx, smtk/extension/remus/MeshOperation.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 8789c277 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 8789c277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/cgm/operators/BooleanSubtraction.cxx, smtk/bridge/discrete/operators/CreateEdgesOperation.cxx, smtk/bridge/discrete/operators/EdgeOperation.cxx, smtk/bridge/discrete/operators/EntityGroupOperation.cxx, smtk/bridge/discrete/operators/GrowOperation.cxx, and 5 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 4d636f86 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 4d636f86 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/discrete/operators/RemoveModel.cxx, smtk/bridge/discrete/operators/SetProperty.cxx, smtk/extension/vtk/operators/ExportEdgesToVTK.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 50e2044a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 50e2044a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/polygon/Operation.txx, smtk/bridge/polygon/operators/CleanGeometry.cxx, smtk/bridge/polygon/operators/CreateEdge.cxx, smtk/bridge/polygon/operators/CreateEdgeFromVertices.cxx, smtk/bridge/polygon/operators/CreateVertices.cxx, and 2 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c050ac2a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit c050ac2a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.h, smtk/model/operators/AssignColors.cxx, smtk/model/operators/CreateInstances.cxx, smtk/model/operators/ExportModelJSON.cxx, smtk/model/operators/GroupAuxiliaryGeometry.cxx, smtk/model/operators/SetProperty.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 7fb754fd is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/json/jsonReferenceItem.cxx, smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit a1b73b4e adds bad whitespace:

      smtk/attribute/testing/cxx/unitJsonItems.cxx:98: tab in indent.
      +	// ReferenceItemDefinition
      smtk/attribute/testing/cxx/unitJsonItems.cxx:175: tab in indent.
      +		if (val) { free(val); }
      smtk/attribute/testing/cxx/unitJsonItems.cxx:176: tab in indent.
      +		dataArgs.pop_back();
      smtk/attribute/testing/cxx/unitJsonItems.cxx:177: tab in indent.
      +	}
    • commit a1b73b4e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 019ca41f is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/attribute/json/jsonComponentItem.cxx, smtk/attribute/json/jsonComponentItem.h, smtk/attribute/json/jsonDoubleItem.cxx, and 17 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit f4787038 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV1Parser.cxx, smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlV3StringWriter.cxx, smtk/io/XmlV3StringWriter.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 3ab44107 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlDocV3Parser.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit e33a314b is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItemDefinition.cxx, smtk/attribute/ResourceItem.h, smtk/io/XmlDocV1Parser.cxx, and 4 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 0b362d65 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ComponentItem.h, smtk/attribute/ResourceItem.h, smtk/operation/groups/ImporterGroup.cxx, smtk/operation/groups/ReaderGroup.cxx, smtk/operation/groups/ResourceIOGroup.cxx, smtk/operation/groups/WriterGroup.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c62cd277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtComponentItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • the merge request is marked as a work-in-progress.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • Errors:

    • commit 87151f10 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 207aee2e cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 207aee2e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/bridge/discrete/operators/EntityGroupOperation.cxx, smtk/bridge/discrete/operators/MergeOperation.cxx, smtk/bridge/discrete/operators/SplitFaceOperation.cxx, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/bridge/polygon/testing/cxx/UnitTestPolygonFindOperationAttItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 190a544b cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 190a544b is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/testing/cxx/unitJsonItems.cxx, smtk/extension/delaunay/operators/TessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTriangulateFaces.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 22c71454 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 22c71454 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/io/XmlDocV3Parser.cxx, smtk/mesh/testing/cxx/TestElevateMeshOnStructuredGrid.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 5e905f0d cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 5e905f0d is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/mesh/testing/cxx/TestElevateMesh.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 4178302c is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV3Parser.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 81b63c7f cannot be merged; it is marked as a work-in-progress (WIP).

    • commit f1048cbc cannot be merged; it is marked as a work-in-progress (WIP).

    • commit f1048cbc is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/bridge/discrete/testing/cxx/mergeFaceTest.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTessellateFaces.cxx, smtk/extension/delaunay/testing/cxx/UnitTestTriangulateFaces.cxx, smtk/extension/remus/MeshOperation.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 8789c277 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 8789c277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/cgm/operators/BooleanSubtraction.cxx, smtk/bridge/discrete/operators/CreateEdgesOperation.cxx, smtk/bridge/discrete/operators/EdgeOperation.cxx, smtk/bridge/discrete/operators/EntityGroupOperation.cxx, smtk/bridge/discrete/operators/GrowOperation.cxx, and 5 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 4d636f86 cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 4d636f86 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/discrete/operators/RemoveModel.cxx, smtk/bridge/discrete/operators/SetProperty.cxx, smtk/extension/vtk/operators/ExportEdgesToVTK.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 50e2044a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit 50e2044a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/bridge/polygon/Operation.txx, smtk/bridge/polygon/operators/CleanGeometry.cxx, smtk/bridge/polygon/operators/CreateEdge.cxx, smtk/bridge/polygon/operators/CreateEdgeFromVertices.cxx, smtk/bridge/polygon/operators/CreateVertices.cxx, and 2 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c050ac2a cannot be merged; it is marked as a work-in-progress (WIP).

    • commit c050ac2a is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.h, smtk/model/operators/AssignColors.cxx, smtk/model/operators/CreateInstances.cxx, smtk/model/operators/ExportModelJSON.cxx, smtk/model/operators/GroupAuxiliaryGeometry.cxx, smtk/model/operators/SetProperty.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 7fb754fd is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/json/jsonReferenceItem.cxx, smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit a1b73b4e adds bad whitespace:

      smtk/attribute/testing/cxx/unitJsonItems.cxx:98: tab in indent.
      +	// ReferenceItemDefinition
      smtk/attribute/testing/cxx/unitJsonItems.cxx:175: tab in indent.
      +		if (val) { free(val); }
      smtk/attribute/testing/cxx/unitJsonItems.cxx:176: tab in indent.
      +		dataArgs.pop_back();
      smtk/attribute/testing/cxx/unitJsonItems.cxx:177: tab in indent.
      +	}
    • commit a1b73b4e is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/testing/cxx/unitJsonItems.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 019ca41f is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, smtk/attribute/json/jsonComponentItem.cxx, smtk/attribute/json/jsonComponentItem.h, smtk/attribute/json/jsonDoubleItem.cxx, and 17 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit f4787038 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV1Parser.cxx, smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlV3StringWriter.cxx, smtk/io/XmlV3StringWriter.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 3ab44107 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/io/XmlDocV3Parser.cxx, smtk/io/XmlDocV3Parser.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit e33a314b is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItemDefinition.cxx, smtk/attribute/ResourceItem.h, smtk/io/XmlDocV1Parser.cxx, and 4 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit 0b362d65 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/ComponentItem.h, smtk/attribute/ResourceItem.h, smtk/operation/groups/ImporterGroup.cxx, smtk/operation/groups/ReaderGroup.cxx, smtk/operation/groups/ResourceIOGroup.cxx, smtk/operation/groups/WriterGroup.cxx. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    • commit c62cd277 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/extension/qt/qtComponentItem.cxx, smtk/extension/qt/qtReferenceItemData.h. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • the merge request is marked as a work-in-progress.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • David Thompson added 8 commits

    added 8 commits

    Compare with previous version

  • Author Maintainer

    Do: test

  • Errors:

    • commit 52ad97e9 is not allowed because the following files are not formatted according to the 'clang-format-3.8' check: smtk/attribute/Attribute.cxx, smtk/attribute/ComponentItem.h, smtk/attribute/Definition.h, smtk/attribute/ReferenceItem.cxx, smtk/attribute/ReferenceItem.h, and 70 others. Post a comment ending in the line Do: reformat to rewrite the MR source branch automatically.

    Warnings:

    • the merge request is marked as a work-in-progress.

    The warnings do not need to be fixed, but it is recommended to do so.

    Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request.

  • This merge request has been queued for testing. Test results may be viewed on:

    • CDash (master)
    • Buildbot (master) (only visible from inside Kitware)

    Branch-at-master: 52ad97e9

  • Author Maintainer

    @tjcorona I believe this is ready to merge; would you mind reviewing? The remaining failures are related to the "Environment management" e-mail thread on the smtk-developers mailing list... I can add changes to support that issue or we could merge this branch and I promise to fix it later? :-)

  • assigned to @tjcorona

  • Awesome!

    +1

  • Author Maintainer

    Do: reformat

  • This topic has been reformatted and pushed; please fetch from the source repository and reset your local branch to continue with further development on the reformatted commits.

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading