Skip to content

Commit

Permalink
Merge pull request #603 from ObjectProfile/masterRebase
Browse files Browse the repository at this point in the history
Master rebase reviewed with @tinchodias  all commits from pharo-graphics/Roassal
  • Loading branch information
akevalion authored Dec 29, 2023
2 parents fff14b1 + b1bb448 commit b4326ec
Show file tree
Hide file tree
Showing 1,378 changed files with 22,983 additions and 30,901 deletions.
Binary file added .DS_Store
Binary file not shown.
2 changes: 0 additions & 2 deletions .coveralls.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/runTestForRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
smalltalk: [ pharo12 ]
group: [ Tests ]
tests: [ "Roassal3,Release" ]
tests: [ "Roassal,Release" ]
os: [ ubuntu-latest ]
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
Expand All @@ -44,8 +44,8 @@ jobs:
id: tests
uses: akevalion/PharoTestsAction@v1
with:
removes-repo: 'Roassal3, Numeric'
baseline: 'Roassal3'
removes-repo: 'Roassal, Numeric'
baseline: 'Roassal'
group: ${{matrix.group}}
tests: ${{matrix.tests}}
pharo: ${{matrix.smalltalk}}
6 changes: 3 additions & 3 deletions .github/workflows/runTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
smalltalk: [ pharo9, pharo10, pharo11, pharo12 ]
group: [ Full ]
tests: [ Roassal3 ]
tests: [ Roassal ]
os: [ ubuntu-latest ]
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
Expand All @@ -45,8 +45,8 @@ jobs:
id: tests
uses: akevalion/PharoTestsAction@v1
with:
removes-repo: 'Roassal3, Numeric'
baseline: 'Roassal3'
removes-repo: 'Roassal, Numeric'
baseline: 'Roassal'
group: ${{matrix.group}}
tests: ${{matrix.tests}}
pharo: ${{matrix.smalltalk}}
55 changes: 0 additions & 55 deletions .github/workflows/visualizeClassDiagram

This file was deleted.

63 changes: 0 additions & 63 deletions .github/workflows/visualizeCoverage

This file was deleted.

10 changes: 0 additions & 10 deletions .smalltalk.ston

This file was deleted.

16 changes: 0 additions & 16 deletions .smalltalk_pharo9.ston

This file was deleted.

38 changes: 0 additions & 38 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Object Profile
Copyright (c) 2023 pharo-graphics

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
72 changes: 21 additions & 51 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,7 @@
# Attention
<img width="400" alt="image" src="https://github.com/ObjectProfile/Roassal3/assets/10532890/c92f4033-954f-4e29-a13d-d90ab23dffcd">

WE ARE MOVING
- Roassal3 => https://github.com/pharo-graphics/Roassal
- Roassal3Exporters => https://github.com/pharo-graphics/RoassalExporters
- Roassal3Documentation => https://github.com/pharo-graphics/RoassalDocumentation

New repositories:
- RoassalLayouts => https://github.com/pharo-graphics/RoassalLayouts

Roassal is part of pharo thats why we want to keep it as part of the pharo ecosystem, thats why we are moving and this repository will be frozen.

To load pharo-graphics/Roassal in a pharo10/11 you will have to remove roassal3 first to avoid conflicts.
```st
#(Roassal3 Numeric) do: [:string |
regExp := '*', string ,'*'.
packages := RPackageOrganizer default packages
select: [ :each | regExp match: each name ].
packages do: [ :each | each removeFromSystem ].
]
```

# Roassal3
# Roassal
[![CI](https://github.com/pharo-graphics/Roassal/actions/workflows/runTests.yml/badge.svg)](https://github.com/pharo-graphics/Roassal/actions/workflows/runTests.yml)

[![CI](https://github.com/ObjectProfile/Roassal3/actions/workflows/runTests.yml/badge.svg)](https://github.com/ObjectProfile/Roassal3/actions/workflows/runTests.yml)
![Discord](https://img.shields.io/discord/223421264751099906)
[![Coverage](https://raw.githubusercontent.com/ObjectProfile/Roassal3/master/ci_data/coverageBadge.svg)](https://github.com/ObjectProfile/Roassal3/blob/master/ci_data/coverage.png)

[![Pharo 8](https://img.shields.io/badge/Pharo-8.0-%23aac9ff.svg)](https://pharo.org/download)
[![Pharo 9](https://img.shields.io/badge/Pharo-9.0-%23aac9ff.svg)](https://pharo.org/download)
Expand All @@ -35,29 +11,25 @@ To load pharo-graphics/Roassal in a pharo10/11 you will have to remove roassal3

[*Chat with us on #Roassal*](https://discord.gg/QewZMZa)

[*Visualize the test coverage of Roassal3*](https://github.com/ObjectProfile/Roassal3/blob/master/ci_data/coverage.png)

<!-- [![SmalltalkCI](https://github.com/ObjectProfile/Roassal3/actions/workflows/main.yml/badge.svg)](https://github.com/ObjectProfile/Roassal3/actions/workflows/main.yml) -->
Old code is here: https://github.com/ObjectProfile/Roassal

<!-- [![Coverage Status](https://coveralls.io/repos/github/ObjectProfile/Roassal3/badge.svg?branch=master)](https://coveralls.io/github/ObjectProfile/Roassal3?branch=master) -->

Roassal3 is an agile visualization engine for [Pharo](http://pharo.org). Roassal was created to enable interactive data visualization, it contains a different groups of shapes an lines that you can use to build your projects, also animations, attach points, events, layouts and a basic chart library.
Roassal is an agile visualization engine for [Pharo](http://pharo.org). Roassal was created to enable interactive data visualization, it contains a different groups of shapes an lines that you can use to build your projects, also animations, attach points, events, layouts and a basic chart library.
Roassal use cairo graphics as backend, in a future will support new backends.
Roassal allows to user to extent the presentation of any object thanks to the inspector. Also it has integration with [spec](https://github.com/pharo-spec/Spec) and also with morphic world

Sister projects: [Roassal3Documentation](https://github.com/ObjectProfile/Roassal3Documentation), [Roassal3Exporters](https://github.com/ObjectProfile/Roassal3Exporters).
Sister projects: [RoassalDocumentation](https://github.com/pharo-graphics/RoassalDocumentation), [RoassalExporters](https://github.com/pharo-graphics/RoassalExporters).

## Pharo Installations
Roassal3 is included from Pharo 9 to 12. This means that you do not need to install anything else. Pharo contains Roassal 0.9.6b.
Roassal is included from Pharo 9 to 12. This means that you do not need to install anything else. Pharo contains Roassal 0.9.6b.
Two installation flavors are available: stable and latest (a.k.a bleeding-edge).

### Stable version
If you wish to install Roassal in Pharo, then execute the following code snippet in a Playground:

```Smalltalk
Metacello new
baseline: 'Roassal3';
repository: 'github://ObjectProfile/Roassal3:v1.01';
baseline: 'Roassal';
repository: 'github://pharo-graphics/Roassal';
load.
```

Expand All @@ -66,8 +38,8 @@ If you wish to have the lastest release of Roassal, then execute the following c

```Smalltalk
[Metacello new
baseline: 'Roassal3';
repository: 'github://ObjectProfile/Roassal3';
baseline: 'Roassal';
repository: 'github://pharo-graphics/Roassal';
load: 'Full' ] on: MCMergeOrLoadWarning do: [:warning | warning load ]
```

Expand All @@ -92,47 +64,45 @@ RSAnimationExamples new example03Atom open
```
You should see:

<img width="250" height="250" alt="atom" src="https://github.com/ObjectProfile/Roassal3/raw/master/images/example03atom.gif?raw=true">
<img width="250" height="250" alt="atom" src="https://github.com/pharo-graphics/Roassal/raw/master/images/example03atom.gif?raw=true">

```Smalltalk
RSExamplesBrowser new open
```
You should see an interactive browser with left right buttons to browse:

<img height="350" alt="exampleBrowser" src="https://github.com/ObjectProfile/Roassal3/raw/master/images/exampleBrowser.png?raw=true">
<img height="350" alt="exampleBrowser" src="https://github.com/pharo-graphics/Roassal/raw/master/images/exampleBrowser.png?raw=true">

```Smalltalk
RSLayoutStudio new open
```
You should see a layout editor browser to choose a layout with the current parameters:

<img height="350" alt="layoutStudio" src="https://github.com/ObjectProfile/Roassal3/raw/master/images/layoutStudio.png?raw=true">
<img height="350" alt="layoutStudio" src="https://github.com/pharo-graphics/Roassal/raw/master/images/layoutStudio.png?raw=true">

## Documentation

Visit the [documentation github page](https://github.com/ObjectProfile/Roassal3Documentation)
Visit the [documentation github page](https://github.com/pharo-graphics/RoassalDocumentation)

A major effort on writing documentation is under way. The wiki pages are yet another source of documentation for Roassal3: https://github.com/ObjectProfile/Roassal3/wiki
A major effort on writing documentation is under way. The wiki pages are yet another source of documentation for Roassal: https://github.com/pharo-graphics/Roassal/wiki

## Roassal3 as a dependent application
If you wish to set a dependency to Roassal3 in your application, you simply need to add the following in your baseline:
## Roassal as a dependent application
If you wish to set a dependency to Roassal in your application, you simply need to add the following in your baseline:

```Smalltalk
spec baseline: 'Roassal3' with: [ spec repository: 'github://ObjectProfile/Roassal3/src' ].
spec baseline: 'Roassal' with: [ spec repository: 'github://pharo-graphics/Roassal/src' ].
```

To depend on a full version of Roassal3, you may use:
To depend on a full version of Roassal, you may use:

```Smalltalk
baseline: 'Roassal3' with: [ spec repository: 'github://ObjectProfile/Roassal3/src'; loads: #('Full') ];
baseline: 'Roassal' with: [ spec repository: 'github://pharo-graphics/Roassal/src'; loads: #('Full') ];
```
_____
## Get in touch
Share your enthusiasm by joining the #Roassal channel, in the Pharo discord server: https://pharo.org/community

Roassal3 is free and open source, but backed by Object Profile. Commercial support offerings are available, including training and custom consultancy services. Check [RoassalPro](https://github.com/ObjectProfile/Roassal3Documentation/blob/6bbc6a4cb36914e1f79b3a038c32984673a1384f/documentation/RoassalPro.md) for more information.
_____
## Acknowledgement

Roassal3 is a community effort, and we are really grateful to a number of people. In no particular order, big thanks to:
Roassal is a community effort, and we are really grateful to a number of people. In no particular order, big thanks to:
Stéphane Ducasse, Martin Días, Pavel Krivanek
Binary file removed ci_data/coverage.png
Binary file not shown.
1 change: 0 additions & 1 deletion ci_data/coverageBadge.svg

This file was deleted.

Empty file removed ci_data/test.txt
Empty file.
Binary file removed ci_data/uml.png
Binary file not shown.
Binary file modified images/layoutStudio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions scripts/getCoverage.sh

This file was deleted.

10 changes: 0 additions & 10 deletions scripts/preLoading.st

This file was deleted.

Loading

0 comments on commit b4326ec

Please sign in to comment.