Merge branch 'dev/1_fixing_default_scale_and_scale_ticks' into 'development-fuw'

#1 better EEG scale default and ticks

See merge request fuw_software/svarog2!1

Author: mdovgialo

svarog/src/main/java/org/signalml/app/model/components/ChannelsPlotOptionsModel.java

@@ -42,8 +42,8 @@ public ChannelsPlotOptionsModel(SignalPlot p) {
 	public void reset(int numOfChannels) {
 		channelsOptions = new ChannelPlotOptionsModel[numOfChannels];
 		for (int i = 0; i < channelsOptions.length; i++) {
-			channelsOptions[i] = new ChannelPlotOptionsModel(this, this.plot
-					.getValueScaleRangeModel().getRealValue());
+                        double scale_value = this.plot.getValueScaleRangeModel().getRealValue();
+			channelsOptions[i] = new ChannelPlotOptionsModel(this, scale_value);
 		}
 	}
 
@@ -133,7 +133,10 @@ public int getVisibleChannelsCount() {
 	public void stateChanged(ChangeEvent e) {
 		Object source = e.getSource();
 		if (source == plot.getValueScaleRangeModel())
-			this.globalScaleChanged(plot.getValueScaleRangeModel().getRealValue());
+                {
+                        double scale_value = plot.getValueScaleRangeModel().getRealValue();
+			this.globalScaleChanged(scale_value);
+                }
 
 	}
 

svarog/src/main/java/org/signalml/app/view/signal/SignalPlot.java

@@ -350,8 +350,7 @@ public SourceChannel getSourceChannelFor(int index) {
 
 	public void initialize() throws SignalMLException {
 
-		calculateParameters();
-
+                calculateParameters();
 		if (masterPlot == null) {
 
 			calculateVoltageZoomFactorRatio();
@@ -374,6 +373,7 @@ public void initialize() throws SignalMLException {
 		}
 		this.channelsPlotOptionsModel.reset(channelCount);
 		calculateParameters();
+
 	}
 
 	/**
@@ -390,7 +390,7 @@ public double getVoltageZoomFactorRatioFor(int index) {
 			v = ChannelFunction.EEG.getMaxValue(); //global voltage scale is for EEG by default
 		else
 			v = this.getSourceChannelFor(index).getFunction().getMaxValue();
-		return ((1.0 / (condMaxValue(v) * 2)) * 0.95) / 100;
+		return ((1.0 / (condMaxValue(v) * 2)) * 0.44) / 100;
 	}
 
 	/**

svarog/src/main/java/org/signalml/app/view/signal/SignalPlotRowHeader.java

@@ -59,7 +59,7 @@ public class SignalPlotRowHeader extends JComponent {
 	/*
 	 * distance (in pixels) from value scale to its label
 	 */
-	private static final int LABEL_LINE_DISTANCE = 5;
+	private static final int LABEL_LINE_DISTANCE = 10;
 
 	private boolean calculated = false;
 
@@ -206,7 +206,7 @@ private void calculate(Graphics2D g) {
 			sb.append("000...");
 		} else {
 
-			while (pixelPerRowUnit <= 5) {
+			while (pixelPerRowUnit <= 20) {
 				pixelPerRowUnit *= 10;
 				sb.append("0");
 			}
@@ -255,11 +255,26 @@ protected void paintComponent(Graphics gOrig) {
 		g.drawLine(size.width-SCALE_HORIZONTAL_LINE_WIDTH, viewportPoint.y,
 				   size.width-SCALE_HORIZONTAL_LINE_WIDTH, viewportPoint.y + viewportSize.height);
 		int tickCnt = 1 + ((int)(((float)(viewportSize.height+1))  / pixelPerRowUnit));
-		for (i=0; i<tickCnt; i++) {
+		
+                for (i=0; i<tickCnt; i++) {
 			y = viewportPoint.y + ((int)(i*pixelPerRowUnit));
 			g.drawLine(size.width-SCALE_HORIZONTAL_LINE_WIDTH+1, y, size.width-1, y);
 		}
 		this.drawChannelsValueTicks(g, size);
+                
+                
+                for (i=0; i<tickCnt; i++) {
+                        if (i%2 == 0)
+                        {
+                            g.setColor(Color.LIGHT_GRAY);
+                        }
+                        else
+                        {
+                            g.setColor(Color.BLACK);
+                        }
+			y = viewportPoint.y + ((int)(i*pixelPerRowUnit));
+			g.fillRect(size.width-2*SCALE_HORIZONTAL_LINE_WIDTH+1, y, SCALE_HORIZONTAL_LINE_WIDTH, (int)(pixelPerRowUnit));
+		}
 
 
 

svarog/src/main/java/org/signalml/app/view/signal/SignalView.java

@@ -503,6 +503,10 @@ public void actionPerformed(ActionEvent e) {
 		if (videoFrame != null) {
 			videoFrame.addListener(new VideoFrameListener());
 		}
+                
+                //
+                this.setSnapToPageMode(true);
+
 	}
 
 	private SignalPlot createSignalPlot(SignalPlot masterPlot) throws SignalMLException {
@@ -1091,6 +1095,10 @@ public void stateChanged(ChangeEvent e) {
 		JToggleButton snapToPageButton = new JToggleButton(getSnapToPageAction());
 		snapToPageButton.setHideActionText(true);
 		mainToolBar.add(snapToPageButton);
+                                
+                snapToPageButton.setSelected(true);
+
+                
 		JToggleButton displayClockTimeButton = new JToggleButton(getDisplayClockTimeAction());
 		displayClockTimeButton.setHideActionText(true);
 		mainToolBar.add(displayClockTimeButton);
@@ -1112,6 +1120,7 @@ public void stateChanged(ChangeEvent e) {
 		filterSwitchButton.setSelectedIcon(IconUtils.loadClassPathIcon("org/signalml/app/icon/filteron.png"));
 		filterSwitchButton.setSelected(document.getMontage().isFiltered());
 		mainToolBar.add(filterSwitchButton);
+                
 
 	}