Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reviewed/removed some pending TODOs.

  • Loading branch information...
commit b4051af63e11be5812b9d8d209f895df3531ea91 1 parent 5c9badd
Jan Willem Janssen authored
2  client/src/main/java/nl/lxtreme/ols/client/MainFrame.java
View
@@ -702,7 +702,7 @@ private boolean isZoomEvent( final MouseWheelEvent aEvent )
return false;
}
- boolean invert = this.diagramModel.isMouseWheelDefaultZooms();
+ boolean invert = this.diagramModel.isMouseWheelZoomDefault();
final int modifier = this.diagramModel.getMouseWheelZoomModifier();
final int result = ( aEvent.getModifiersEx() & modifier );
2  client/src/main/java/nl/lxtreme/ols/client/action/HelpAboutAction.java
View
@@ -48,7 +48,7 @@
*/
public HelpAboutAction( final ClientController aController )
{
- super( ID, aController, "About OLS", "" ); // XXX
+ super( ID, aController, "About OLS", "" );
putValue( MNEMONIC_KEY, Integer.valueOf( KeyEvent.VK_A ) );
}
2  client/src/main/java/nl/lxtreme/ols/client/signaldisplay/laf/ChannelLabelsUI.java
View
@@ -232,7 +232,7 @@ final void paintSignalGroup( final Graphics2D aCanvas, final ChannelLabelsViewMo
//
// this.renderer.setContext( Integer.valueOf( aWidth ), Integer.valueOf(
// height ), aSignalElement.getLabel() );
- // this.renderer.render( aCanvas, -30, 0 ); // XXX
+ // this.renderer.render( aCanvas, -30, 0 );
}
/**
13 client/src/main/java/nl/lxtreme/ols/client/signaldisplay/laf/UIManagerKeys.java
View
@@ -31,15 +31,22 @@
{
// CONSTANTS
+ /** The space between two signal elements, in pixels. */
String SIGNAL_ELEMENT_SPACING = "ols.signal.element.spacer.height";
-
+ /** Whether or not the mouse wheel by defaults zooms in/out. */
+ String MOUSEWHEEL_ZOOM_DEFAULT = "ols.mousewheel.zoom.default.boolean";
+ /** The default color for channels, groups and scopes. */
String CHANNEL_DEFAULT_COLOR = "ols.channel.default.color";
-
+ /** The height of the signal group, in pixels. */
String SIGNAL_GROUP_HEIGHT = "ols.signalgroup.height";
+ /** The height of the digital channels, in pixels. */
String CHANNEL_HEIGHT = "ols.channel.height";
+ /** The height of the digitial signals, in pixels. */
String DIGITAL_SIGNAL_HEIGHT = "ols.digitalsignal.height";
- String ANALOG_SCOPE_HEIGHT = "ols.analogscope.height";
+ /** The height of the group summary, in pixels. */
String GROUP_SUMMARY_HEIGHT = "ols.groupsummary.height";
+ /** The height of the analog scope, in pixels. */
+ String ANALOG_SCOPE_HEIGHT = "ols.analogscope.height";
String CHANNELLABELS_BACKGROUND_COLOR = "ols.channellabels.background.color";
String CHANNELLABELS_MINIMAL_WIDTH = "ols.channellabels.minimal.width";
7 client/src/main/java/nl/lxtreme/ols/client/signaldisplay/model/SignalDiagramModel.java
View
@@ -27,12 +27,14 @@
import java.util.*;
import java.util.List;
+import javax.swing.*;
import javax.swing.event.*;
import nl.lxtreme.ols.api.acquisition.*;
import nl.lxtreme.ols.api.data.*;
import nl.lxtreme.ols.api.data.Cursor;
import nl.lxtreme.ols.client.signaldisplay.*;
+import nl.lxtreme.ols.client.signaldisplay.laf.*;
import nl.lxtreme.ols.client.signaldisplay.signalelement.*;
import nl.lxtreme.ols.client.signaldisplay.signalelement.SignalElementManager.SignalElementMeasurer;
import nl.lxtreme.ols.util.*;
@@ -922,10 +924,9 @@ public boolean isMeasurementMode()
* <code>false</code> if the default mouse-wheel behavior is to
* scroll.
*/
- public boolean isMouseWheelDefaultZooms()
+ public boolean isMouseWheelZoomDefault()
{
- // TODO Auto-generated method stub
- return false;
+ return UIManager.getBoolean( UIManagerKeys.MOUSEWHEEL_ZOOM_DEFAULT );
}
/**
2  client/src/main/java/nl/lxtreme/ols/client/signaldisplay/signalelement/SignalElementManager.java
View
@@ -197,8 +197,6 @@ public void dataModelChanged( final DataSet aCapturedData )
final int groupCount = Math.max( 1, ( int )Math.ceil( newChannelList.length / ( double )Ols.CHANNELS_PER_BLOCK ) );
final int channelsPerGroup = ( int )Math.ceil( newChannelList.length / ( double )groupCount );
- // TODO property change listeners on SignalElements!
-
this.elements.clear();
this.groups.clear();
39 client/src/main/java/nl/lxtreme/ols/client/signaldisplay/view/TimeLineView.java
View
@@ -154,17 +154,7 @@ public void addNotify()
@Override
public void cursorAdded( final Cursor aCursor )
{
- // final int visibleHeight = getVisibleRect().height;
- //
- // final TimeLineViewModel model = getModel();
- //
- // final long timestamp = aCursor.getTimestamp();
- //
- // int cursorPos = model.timestampToCoordinate( timestamp );
- // int width = getStringWidth( model.getCursorFlagText( aCursor.getIndex(),
- // timestamp ) ) + 10;
- // repaint( cursorPos - 1, 0, width, visibleHeight );
- repaint( 50L ); // XXX
+ repaint( 50L );
}
/**
@@ -173,22 +163,7 @@ public void cursorAdded( final Cursor aCursor )
@Override
public void cursorChanged( final String aPropertyName, final Cursor aOldCursor, final Cursor aNewCursor )
{
- // final int visibleHeight = getVisibleRect().height;
- //
- // final TimeLineViewModel model = getModel();
- //
- // int cursorPos = model.timestampToCoordinate( aOldCursor.getTimestamp() );
- // int width = getStringWidth( model.getCursorFlagText(
- // aOldCursor.getIndex(), aOldCursor.getTimestamp() ) );
- // repaint( new Rectangle( cursorPos - ( width / 2 ) - 5, 0, width + 10,
- // visibleHeight ) );
- //
- // cursorPos = model.timestampToCoordinate( aNewCursor.getTimestamp() );
- // width = getStringWidth( model.getCursorFlagText( aNewCursor.getIndex(),
- // aNewCursor.getTimestamp() ) );
- // repaint( 0, cursorPos - ( width / 2 ) - 5, 0, width + 10, visibleHeight
- // );
- repaint( 50L ); // XXX
+ repaint( 50L );
}
/**
@@ -197,15 +172,7 @@ public void cursorChanged( final String aPropertyName, final Cursor aOldCursor,
@Override
public void cursorRemoved( final Cursor aOldCursor )
{
- // final int visibleHeight = getVisibleRect().height;
- //
- // final TimeLineViewModel model = getModel();
- //
- // int cursorPos = model.timestampToCoordinate( aOldCursor.getTimestamp() );
- // int width = getStringWidth( model.getCursorFlagText(
- // aOldCursor.getIndex(), aOldCursor.getTimestamp() ) ) + 10;
- // repaint( cursorPos - 1, 0, width, visibleHeight );
- repaint( 50L ); // XXX
+ repaint( 50L );
}
/**
1  ols.distribution/src/main/config/ols.ui.defaults.cfg
View
@@ -1,5 +1,6 @@
# Generic
ols.background.color = 1E2126
+ols.mousewheel.zoom.default.boolean = false
ols.channel.default.color = 7BF9D3
ols.signal.element.spacer.height = 4
ols.analogscope.height = 96
2  service.io/src/main/java/nl/lxtreme/ols/io/serial/CommConnectionImpl.java
View
@@ -203,7 +203,7 @@ public OutputStream openOutputStream() throws IOException
public int setBaudRate( final int aBaudRate )
{
final int oldBaudRate = getBaudRate();
- // this.port.setBaud( aBaudRate ); XXX
+ // not supported; no change possible...
return oldBaudRate;
}
}
2  tool.spi/src/main/java/nl/lxtreme/ols/tool/spi/SPIAnalyserTask.java
View
@@ -536,7 +536,7 @@ private void reportCsLow( final SPIDataSet aDecodedData, final int aIndex )
private void reportData( final SPIDataSet aDecodedData, final int aStartIdx, final int aEndIdx, final int aMosiValue,
final int aMisoValue )
{
- long[] timestamps = this.context.getData().getTimestamps(); // XXX
+ long[] timestamps = this.context.getData().getTimestamps();
if ( this.mosiIdx >= 0 )
{
Please sign in to comment.
Something went wrong with that request. Please try again.