Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
a6fa6ecb
Commit
a6fa6ecb
authored
Dec 13, 2016
by
Jakob Schöttl
Browse files
Fix code and comments
parent
5299ffa4
Changes
2
Hide whitespace changes
Inline
Side-by-side
VadereGui/src/org/vadere/gui/topographycreator/model/IDrawPanelModel.java
View file @
a6fa6ecb
...
...
@@ -4,7 +4,6 @@ import java.awt.Color;
import
java.awt.Cursor
;
import
java.awt.Font
;
import
java.awt.Point
;
import
java.awt.event.ComponentListener
;
import
java.util.Observer
;
import
org.vadere.gui.components.control.IMode
;
...
...
@@ -21,6 +20,7 @@ import org.vadere.util.geometry.shapes.VShape;
public
interface
IDrawPanelModel
<
T
extends
DefaultConfig
>
extends
IDefaultModel
<
T
>,
Iterable
<
ScenarioElement
>
{
@Override
void
notifyObservers
();
/**
...
...
@@ -67,17 +67,20 @@ public interface IDrawPanelModel<T extends DefaultConfig> extends IDefaultModel<
*
* @return true if the user is selecting a topography element, otherwise false.
*/
@Override
boolean
isSelectionVisible
();
/**
* After this call the selction shape will be painted.
*/
@Override
void
showSelection
();
/**
* After this call the selction shape will no longer be painted.
*/
@Override
void
hideSelection
();
/**
...
...
@@ -93,14 +96,17 @@ public interface IDrawPanelModel<T extends DefaultConfig> extends IDefaultModel<
void
resetScenario
();
@Override
ScenarioElement
getSelectedElement
();
Color
getCursorColor
();
void
setCursorColor
(
Color
red
);
@Override
void
setMouseSelectionMode
(
IMode
selectionMode
);
@Override
IMode
getMouseSelectionMode
();
Cursor
getCursor
();
...
...
@@ -128,6 +134,7 @@ public interface IDrawPanelModel<T extends DefaultConfig> extends IDefaultModel<
* @param position
* @return
*/
@Override
ScenarioElement
setSelectedElement
(
VPoint
position
);
boolean
removeElement
(
ScenarioElement
element
);
...
...
@@ -142,10 +149,12 @@ public interface IDrawPanelModel<T extends DefaultConfig> extends IDefaultModel<
void
setTopography
(
Topography
topography
);
@Override
void
notifyObservers
(
final
Object
string
);
int
getBoundId
();
@Override
void
setSelectedElement
(
ScenarioElement
selectedElement
);
VShape
translate
(
Point
vector
);
...
...
VadereGui/src/org/vadere/gui/topographycreator/model/TopographyCreatorModel.java
View file @
a6fa6ecb
...
...
@@ -25,7 +25,6 @@ import org.vadere.util.geometry.shapes.VShape;
/**
* The data of the DrawPanel. Its holds the whole data of one scenario.
*
*
*/
public
class
TopographyCreatorModel
extends
DefaultModel
implements
IDrawPanelModel
{
...
...
@@ -221,13 +220,6 @@ public class TopographyCreatorModel extends DefaultModel implements IDrawPanelMo
return
font
;
}
/*
* @Override
* public double getFinishTime() {
* return topographyBuilder.getAttributes().getFinishTime();
* }
*/
@Override
public
void
setTopographyBound
(
final
VRectangle
scenarioBound
)
{
try
{
...
...
@@ -437,9 +429,9 @@ public class TopographyCreatorModel extends DefaultModel implements IDrawPanelMo
return
topographyBuilder
.
build
();
}
// privte helper methods
private
VPoint
alignToGrid
(
final
VPoint
point
)
{
double
factor
=
Math
.
max
(
10
,
1
/
getGridResolution
());
return
new
VPoint
(
Math
.
round
(
point
.
x
*
factor
)
/
factor
,
Math
.
round
(
point
.
y
*
factor
)
/
factor
);
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment