Skip to content

Commit

Permalink
Version 0.5.
Browse files Browse the repository at this point in the history
Smaller improvements to user user manual.
Wrong check menu item removed.
  • Loading branch information
treimers committed Jan 20, 2022
1 parent b92e71d commit 15fc1dd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.treimers</groupId>
<artifactId>square1fx</artifactId>
<version>0.4</version>
<version>0.5</version>
<name>Square-1</name>
<organization>
<name>Thorsten Reimers</name>
Expand Down
12 changes: 6 additions & 6 deletions src/main/markdown/net/treimers/square1/1_2_notation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Jaap Scherphuis introduced a notation to model a Square-1 position.

A Square-1 consists of 8 corner pieces, 8 edge pieces and 2 middle pieces. All corner pieces are named by letters from 'A' to 'H', all edge pieces are named by digits from '0' to '9'.
A Square-1 consists of 8 corner pieces, 8 edge pieces and 2 middle pieces. All corner pieces are named by letters from 'A' to 'H', all edge pieces are named by digits from '1' to '8'.

The middle layer has two pieces with possible positions:

Expand All @@ -11,23 +11,23 @@ The middle layer has two pieces with possible positions:

An original middle layer is reflected in this notation by a '-' character while a twisted middle layer is identified by a '/' character.

Hold the Square-1 so that a long side of the middle layer is on the left side. You should see a gap in the front with a smaller face on to the left and a longer one to the right.
Hold the Square-1 so that one of the longer sides of the middle layer is on the left side. You should see a gap in the front with a smaller rectangle to the left and a longer rectangle to the right.

The pieces in the top layer are now counted starting from the position left to this gap. The following pieces are order clockwise (from top view). On a solved Square-1 the top layer is denoted by A1B2C3D4.
The pieces in the top layer are now counted starting from the position left to this gap. Subsequent pieces are ordered clockwise (from top view). On a solved Square-1 the top layer is denoted by A1B2C3D4.

The pieces in the bottom layer are counted starting from the position right to the gap. Next pieces are arranged clockwise (from bottom view). The bottom layer of a solved Square-1 consist of pieces 5E6F7G8H.

The start pieces of top and bottom layer are illustrated in the next picture:
The starting piece positions at top and bottom layer are illustrated in the next picture:

<img src="images/notation.png" alt="Notation" width="323" height="291">

All these are put together into a position string with top layer pieces, bottom layer pieces and middle layer position. This gives
Putting this all together gives the position string with top layer pieces, bottom layer pieces and middle layer position. This results in

A1B2C3D45E6F7G8H-

for a solved Square-1.

The Square-1 with a twisted middle layer is represented by this position string
A Square-1 with a twisted middle layer is represented by this position string

A1B2C3D45E6F7G8H/

Expand Down
4 changes: 2 additions & 2 deletions src/main/markdown/net/treimers/square1/2_1_enter.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ You can consecutively add all pieces using drag and drop until the scrambled Squ

The middle position can be selected and added at any time during this process.

Note that there are position text fields available in the bottom of this dialog. You can also enter pieces using the character and remove them as well.
Note that there are text fields available in the bottom left of this dialog for the position. You can also enter pieces using their name by hitting the corresponding character on your keyboard. Also you can remove pieces via these fields with the delete key.

Helper buttons to rotate the Square-1 and all pieces or to return to solved, empty or last position are available as well.
Helper buttons to rotate the Square-1 and all pieces or to return to the solved position, the empty position or the last position are available as well.
1 change: 0 additions & 1 deletion src/main/resources/net/treimers/square1/square1.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>
<CheckMenuItem mnemonicParsing="false" text="Unspecified Action" />
<MenuItem mnemonicParsing="false" onAction="#doHelp" text="Help">
<accelerator>
<KeyCodeCombination alt="UP" code="F1" control="UP" meta="UP" shift="UP" shortcut="UP" />
Expand Down

0 comments on commit 15fc1dd

Please sign in to comment.