rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-09-21 23:01:35 -04:00
parent 68db944276
commit ec3cafe6ef
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/controllers/trigger/trigger_structure.h
View File

@ -39,9 +39,6 @@ public:
bool_t isSynchronizationNeeded;
bool_t needSecondTriggerInput;
// int totalToothCount;
// int skippedToothCount;
/**
* duty cycle for each individual trigger channel
*/
@ -74,16 +71,16 @@ public:
*/
angle_t tdcPosition;
/**
* Should we use falls or rises for gap ratio detection?
*/
bool_t useRiseEdge;
/**
* In case of a multi-channel trigger, do we want to sync based on primary channel only?
* See also gapBothDirections
*/
bool_t useOnlyPrimaryForSync;
/**
* Should we use falls or rises for gap ratio detection?
* todo: combine this flag with gapBothDirections?
*/
bool_t useRiseEdge;
/**
* This is about selecting signal edges within partictular trigger channels.
* Should we measure gaps with both fall and rise signal edges?

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -32,7 +32,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see com.rusefi.StartupFrame
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20150920;
public static final int CONSOLE_VERSION = 20150921;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

10
java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java
View File

@ -58,8 +58,11 @@ public class EngineSnifferPanel {
@Override
public Dimension getPreferredSize() {
Dimension d = chartPanel.getSize();
System.out.println("chartPanel size " + d);
Dimension s = super.getPreferredSize();
return new Dimension((int) (d.width * zoomControl.getZoomProvider().getZoomValue()), s.height);
Dimension dimension = new Dimension((int) (d.width * zoomControl.getZoomProvider().getZoomValue()), s.height);
System.out.println("imagePanel getPreferredSize" + dimension);
return dimension;
}
};
@ -156,7 +159,10 @@ public class EngineSnifferPanel {
@Override
public void onZoomChange() {
System.out.println("onZoomChange");
UiUtils.trueRepaint(imagePanel);
/**
* We have scroll pane size which depends on zoom, that's a long chain of dependencies
*/
UiUtils.trueLayout(imagePanel.getParent());
}
};