projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0072642
)
Changed how the SubmodelComponent decides whether to show its submodel
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 25 Mar 2020 18:07:45 +0000
(19:07 +0100)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Wed, 25 Mar 2020 18:07:45 +0000
(19:07 +0100)
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
patch
|
blob
|
history
plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
patch
|
blob
|
history
diff --git
a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
index
61c97b3
..
f647cb7
100644
(file)
--- a/
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
+++ b/
plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
@@
-362,7
+362,7
@@
public abstract class SubmodelComponent extends ModelComponent
GCConfig conf = new GCConfig(gc);
GeneralGC tgc = new TranslatedGC(gc, getPosX(), getPosY(), submodelScale, true);
conf.reset(tgc);
GCConfig conf = new GCConfig(gc);
GeneralGC tgc = new TranslatedGC(gc, getPosX(), getPosY(), submodelScale, true);
conf.reset(tgc);
- double visibleRegionFillRatio =
Math.max(getWidth() / visibleRegion.width, getHeight() /
visibleRegion.height);
+ double visibleRegionFillRatio =
getWidth() * getHeight() / (visibleRegion.width *
visibleRegion.height);
/**
* If this {@link SubmodelComponent} fills at least this amount of the visible region vertically or horizontally, the submodel
* starts to be visible.
/**
* If this {@link SubmodelComponent} fills at least this amount of the visible region vertically or horizontally, the submodel
* starts to be visible.
diff --git
a/plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
b/plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
index
1f6820d
..
67bb46a
100644
(file)
--- a/
plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
+++ b/
plugins/net.mograsim.preferences/src/net/mograsim/preferences/DefaultPreferences.java
@@
-54,9
+54,9
@@
public class DefaultPreferences extends Preferences
case "net.mograsim.logic.model.linewidth.wire.multibit":
return 0.85;
case "net.mograsim.logic.model.submodel.zoomalpha0":
case "net.mograsim.logic.model.linewidth.wire.multibit":
return 0.85;
case "net.mograsim.logic.model.submodel.zoomalpha0":
- return 0.
8
;
+ return 0.
1
;
case "net.mograsim.logic.model.submodel.zoomalpha1":
case "net.mograsim.logic.model.submodel.zoomalpha1":
- return 0.
9
;
+ return 0.
2
;
default:
throw new IllegalArgumentException("Unknown double preference name: " + name);
}
default:
throw new IllegalArgumentException("Unknown double preference name: " + name);
}