|
@@ -686,28 +686,43 @@ public class MainView {
|
|
|
pl.remove( bottomLeft );
|
|
|
pl.remove( bottomRight );
|
|
|
pl.remove( combined );
|
|
|
- switch( algorithm.getAlgorithmState() )
|
|
|
+ layne.remove( combined );
|
|
|
+ if( optionsDialog.getLayerDisplayOption() == 0)
|
|
|
{
|
|
|
- case CONFLICT_DETECTION:
|
|
|
+ pl.setLayout( grout );
|
|
|
pl.add( topLeft );
|
|
|
- break;
|
|
|
- case LEFTMOST_UPPER:
|
|
|
- pl.add( topLeft );
|
|
|
- break;
|
|
|
- case RIGHTMOST_UPPER:
|
|
|
pl.add( topRight );
|
|
|
- break;
|
|
|
- case LEFTMOST_LOWER:
|
|
|
pl.add( bottomLeft );
|
|
|
- break;
|
|
|
- case RIGHTMOST_LOWER:
|
|
|
pl.add( bottomRight );
|
|
|
- break;
|
|
|
- case COMBINE:
|
|
|
- pl.add( combined );
|
|
|
- break;
|
|
|
+ layne.add( combined, 0 );
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ pl.setLayout( new BorderLayout() );
|
|
|
+ switch( algorithm.getAlgorithmState() )
|
|
|
+ {
|
|
|
+ case CONFLICT_DETECTION:
|
|
|
+ pl.add( topLeft );
|
|
|
+ break;
|
|
|
+ case LEFTMOST_UPPER:
|
|
|
+ pl.add( topLeft );
|
|
|
+ break;
|
|
|
+ case RIGHTMOST_UPPER:
|
|
|
+ pl.add( topRight );
|
|
|
+ break;
|
|
|
+ case LEFTMOST_LOWER:
|
|
|
+ pl.add( bottomLeft );
|
|
|
+ break;
|
|
|
+ case RIGHTMOST_LOWER:
|
|
|
+ pl.add( bottomRight );
|
|
|
+ break;
|
|
|
+ case COMBINE:
|
|
|
+ pl.add( combined );
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
pl.revalidate();
|
|
|
+ layne.revalidate();
|
|
|
for( ComponentListener l : frame.getComponentListeners() )
|
|
|
l.componentResized( new ComponentEvent( frame, 0 ) );
|
|
|
}
|