Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improving classes structure #32

Closed
wants to merge 4 commits into from
Closed

Improving classes structure #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eea411c
Now transitions view are inherited from BasicTransitionView
IgorFilimonov Oct 9, 2024
72b4eb8
Separated elements views from the others
IgorFilimonov Oct 10, 2024
7373730
Optimized imports
IgorFilimonov Oct 10, 2024
8eb0409
Moved AdjacencyMatrixTransitionView to other transitions views
IgorFilimonov Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/kotlin/automaton/constructor/controller/AutomatonGraphController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import automaton.constructor.model.element.*
import automaton.constructor.utils.*
import automaton.constructor.view.*
import automaton.constructor.view.automaton.AutomatonGraphView
import automaton.constructor.view.elements.vertex.AutomatonVertexView
import automaton.constructor.view.elements.transition.TransitionView
import javafx.geometry.Point2D
import javafx.scene.control.ContextMenu
import javafx.scene.input.KeyCode
Expand Down
8 changes: 5 additions & 3 deletions src/main/kotlin/automaton/constructor/view/AutomatonEdgeView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import automaton.constructor.model.element.AutomatonEdge
import automaton.constructor.model.element.AutomatonVertex.Companion.RADIUS
import automaton.constructor.model.element.Transition
import automaton.constructor.utils.*
import automaton.constructor.view.AutomatonVertexView.ShapeType
import automaton.constructor.view.AutomatonVertexView.ShapeType.CIRCLE
import automaton.constructor.view.AutomatonVertexView.ShapeType.SQUARE
import automaton.constructor.view.elements.vertex.AutomatonVertexView
import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType
import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.CIRCLE
import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.SQUARE
import automaton.constructor.view.elements.transition.TransitionView
import javafx.beans.binding.Bindings.isNotNull
import javafx.beans.value.ObservableBooleanValue
import javafx.beans.value.ObservableDoubleValue
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/automaton/constructor/view/automaton/AutomatonAdjacencyMatrixView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import automaton.constructor.model.automaton.Automaton
import automaton.constructor.model.element.AutomatonVertex
import automaton.constructor.model.element.Transition
import automaton.constructor.utils.I18N
import automaton.constructor.view.AdjacencyMatrixTransitionView
import automaton.constructor.view.elements.transition.AdjacencyMatrixTransitionView
import automaton.constructor.view.AutomatonViewContext
import javafx.beans.property.ReadOnlyDoubleProperty
import javafx.beans.property.SimpleObjectProperty
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/automaton/constructor/view/automaton/AutomatonGraphView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import automaton.constructor.model.element.State
import automaton.constructor.utils.hoverableTooltip
import automaton.constructor.utils.subPane
import automaton.constructor.view.AutomatonEdgeView
import automaton.constructor.view.AutomatonVertexView
import automaton.constructor.view.elements.vertex.AutomatonVertexView
import automaton.constructor.view.AutomatonViewContext
import automaton.constructor.view.module.executor.executionStatesTooltip
import javafx.collections.MapChangeListener
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/automaton/constructor/view/automaton/AutomatonTableView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import automaton.constructor.model.element.Transition
import automaton.constructor.utils.I18N
import automaton.constructor.utils.addOnSuccess
import automaton.constructor.utils.hoverableTooltip
import automaton.constructor.view.AutomatonTableVertexView
import automaton.constructor.view.elements.vertex.AutomatonTableVertexView
import automaton.constructor.view.AutomatonViewContext
import automaton.constructor.view.TableTransitionView
import automaton.constructor.view.elements.transition.TableTransitionView
import javafx.beans.property.ReadOnlyDoubleProperty
import javafx.beans.property.SimpleObjectProperty
import javafx.beans.property.SimpleStringProperty
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/automaton/constructor/view/automaton/AutomatonTransitionTableView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import automaton.constructor.model.element.AutomatonVertex
import automaton.constructor.model.element.Transition
import automaton.constructor.utils.I18N
import automaton.constructor.view.AutomatonViewContext
import automaton.constructor.view.TransitionTableTransitionView
import automaton.constructor.view.elements.transition.TransitionTableTransitionView
import javafx.beans.property.ReadOnlyDoubleProperty
import javafx.beans.property.SimpleObjectProperty
import javafx.scene.control.*
Expand Down
5 changes: 3 additions & 2 deletions ...tor/view/AdjacencyMatrixTransitionView.kt → ...ansition/AdjacencyMatrixTransitionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package automaton.constructor.view
package automaton.constructor.view.elements.transition

import automaton.constructor.model.element.Transition
import automaton.constructor.view.elements.transition.TableTransitionView
import javafx.scene.paint.Color
import tornadofx.label

Expand All @@ -11,4 +12,4 @@ class AdjacencyMatrixTransitionView(transition: Transition): TableTransitionView
textFill = Color.BLACK
}
}
}
}
7 changes: 4 additions & 3 deletions ...n/constructor/view/TableTransitionView.kt → ...lements/transition/BasicTransitionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package automaton.constructor.view
package automaton.constructor.view.elements.transition

import automaton.constructor.model.element.Transition
import automaton.constructor.utils.I18N
import automaton.constructor.utils.Setting
import automaton.constructor.utils.SettingGroup
import automaton.constructor.utils.createUnmodifiableSettingControl
import automaton.constructor.view.AutomatonElementView
import tornadofx.toProperty

open class TableTransitionView(val transition: Transition): AutomatonElementView(transition) {
open class BasicTransitionView(val transition: Transition): AutomatonElementView(transition) {
override fun getSettings() = listOf(
SettingGroup(
I18N.messages.getString("TransitionView.Transition").toProperty(), listOf(
Expand All @@ -22,4 +23,4 @@ open class TableTransitionView(val transition: Transition): AutomatonElementView
)
)
) + super.getSettings()
}
}
6 changes: 6 additions & 0 deletions src/main/kotlin/automaton/constructor/view/elements/transition/TableTransitionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package automaton.constructor.view.elements.transition

import automaton.constructor.model.element.Transition
import automaton.constructor.view.elements.transition.BasicTransitionView

open class TableTransitionView(transition: Transition): BasicTransitionView(transition)
4 changes: 2 additions & 2 deletions ...tor/view/TransitionTableTransitionView.kt → ...ansition/TransitionTableTransitionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package automaton.constructor.view
package automaton.constructor.view.elements.transition

import automaton.constructor.model.element.Transition
import javafx.scene.paint.Color
Expand All @@ -22,4 +22,4 @@ class TransitionTableTransitionView(transition: Transition): TableTransitionView
}
}
}
}
}
22 changes: 4 additions & 18 deletions ...omaton/constructor/view/TransitionView.kt → ...iew/elements/transition/TransitionView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package automaton.constructor.view
package automaton.constructor.view.elements.transition

import automaton.constructor.model.element.Transition
import automaton.constructor.utils.*
import automaton.constructor.view.elements.transition.BasicTransitionView
import javafx.beans.binding.Binding
import javafx.beans.property.DoubleProperty
import javafx.scene.paint.Color
import javafx.scene.text.Font
import tornadofx.*

class TransitionView(
val transition: Transition,
transition: Transition,
index: Int
) : AutomatonElementView(transition) {
) : BasicTransitionView(transition) {
val indexProperty = index.toProperty()
var index by indexProperty
val xProperty: DoubleProperty
Expand All @@ -21,21 +22,6 @@ class TransitionView(
if (selected) Color.BLUE else Color.BLACK
}

override fun getSettings() = listOf(
SettingGroup(
I18N.messages.getString("TransitionView.Transition").toProperty(), listOf(
Setting(
I18N.messages.getString("TransitionView.Source"),
createUnmodifiableSettingControl(transition.source.nameProperty)
),
Setting(
I18N.messages.getString("TransitionView.Target"),
createUnmodifiableSettingControl(transition.target.nameProperty)
)
)
)
) + super.getSettings()

init {
val text = text {
fillProperty().bind(colorProperty)
Expand Down
9 changes: 2 additions & 7 deletions ...structor/view/AutomatonBasicVertexView.kt → ...ements/vertex/AutomatonBasicVertexView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
package automaton.constructor.view
package automaton.constructor.view.elements.vertex

import automaton.constructor.model.element.AutomatonVertex
import automaton.constructor.model.element.BuildingBlock
import automaton.constructor.model.module.hasProblems
import automaton.constructor.model.module.hasProblemsBinding
import automaton.constructor.utils.I18N
import automaton.constructor.utils.Setting
import automaton.constructor.utils.SettingGroup
import javafx.beans.property.SimpleIntegerProperty
import javafx.beans.property.SimpleStringProperty
import automaton.constructor.view.AutomatonElementView
import javafx.scene.control.CheckBox
import javafx.scene.control.TextField
import javafx.scene.paint.Color
import tornadofx.*

open class AutomatonBasicVertexView(val vertex: AutomatonVertex) : AutomatonElementView(vertex) {
Expand Down
2 changes: 1 addition & 1 deletion ...structor/view/AutomatonTableVertexView.kt → ...ements/vertex/AutomatonTableVertexView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package automaton.constructor.view
package automaton.constructor.view.elements.vertex

import automaton.constructor.model.element.AutomatonVertex
import automaton.constructor.model.element.BuildingBlock
Expand Down
10 changes: 6 additions & 4 deletions ...n/constructor/view/AutomatonVertexView.kt → ...ew/elements/vertex/AutomatonVertexView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package automaton.constructor.view
package automaton.constructor.view.elements.vertex

import automaton.constructor.model.element.AutomatonVertex
import automaton.constructor.model.element.AutomatonVertex.Companion.RADIUS
import automaton.constructor.model.element.BuildingBlock
import automaton.constructor.model.element.State
import automaton.constructor.model.module.hasProblems
import automaton.constructor.model.module.hasProblemsBinding
import automaton.constructor.utils.*
import automaton.constructor.view.AutomatonVertexView.ShapeType.CIRCLE
import automaton.constructor.view.AutomatonVertexView.ShapeType.SQUARE
import automaton.constructor.utils.nonNullObjectBinding
import automaton.constructor.utils.x
import automaton.constructor.utils.y
import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.CIRCLE
import automaton.constructor.view.elements.vertex.AutomatonVertexView.ShapeType.SQUARE
import javafx.beans.property.Property
import javafx.geometry.Point2D
import javafx.geometry.VPos
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/automaton/constructor/view/module/executor/tree/ExecutionNodeView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import automaton.constructor.model.module.executor.SimpleExecutionState
import automaton.constructor.model.module.executor.SuperExecutionState
import automaton.constructor.utils.*
import automaton.constructor.view.AutomatonEdgeView
import automaton.constructor.view.AutomatonVertexView
import automaton.constructor.view.elements.vertex.AutomatonVertexView
import automaton.constructor.view.TransitionLabelPosition
import automaton.constructor.view.module.executor.color
import automaton.constructor.view.module.executor.simpleTooltipContent
Expand Down
Loading