diff --git a/src/main/java/com/shamwerks/camwerks/CamWerks.java b/src/main/java/com/shamwerks/camwerks/CamWerks.java index ebad84a..f927173 100644 --- a/src/main/java/com/shamwerks/camwerks/CamWerks.java +++ b/src/main/java/com/shamwerks/camwerks/CamWerks.java @@ -59,7 +59,6 @@ public void setFrame(CwFrame frame) { public static void main(String[] args) throws IOException { instance.config = new Config(); - System.out.println(instance.config.getNbSteps()); EventQueue.invokeLater(new Runnable() { public void run() { @@ -77,8 +76,6 @@ public void run() { public void runMeasureSequence(){ - System.out.println("Looping through Cylinders cams"); - boolean connected = arduino.initialize(); if(connected) { diff --git a/src/main/java/com/shamwerks/camwerks/config/Config.java b/src/main/java/com/shamwerks/camwerks/config/Config.java index 47ada1a..546179c 100644 --- a/src/main/java/com/shamwerks/camwerks/config/Config.java +++ b/src/main/java/com/shamwerks/camwerks/config/Config.java @@ -16,17 +16,13 @@ public class Config { private String comPorts[]; public Config(){ - System.out.println("Working Directory = " + System.getProperty("user.dir")); //loading the config.properties file Properties props = new Properties(); try { - //System.out.println("stream=" + this.getClass().getResourceAsStream(CONFIG_FILE)); - //props.load( this.getClass().getResourceAsStream(CONFIG_FILE ) ); props.load( new FileInputStream( CONFIG_FILE ) ); } catch (IOException e) { e.printStackTrace(); } - System.out.println("config="+props); language = props.getProperty("language"); nbSteps = Integer.parseInt(props.getProperty("nbSteps")); nbStepsIncrement = Integer.parseInt(props.getProperty("nbStepsIncrement")); diff --git a/src/main/java/com/shamwerks/camwerks/config/Lang.java b/src/main/java/com/shamwerks/camwerks/config/Lang.java index 98d06a3..87b43c4 100644 --- a/src/main/java/com/shamwerks/camwerks/config/Lang.java +++ b/src/main/java/com/shamwerks/camwerks/config/Lang.java @@ -19,19 +19,6 @@ public static String getText(LangEntry key){ public Lang(){ Locale currentLocale = Locale.FRENCH; - - /* - ResourceBundle labels = ResourceBundle.getBundle("config/Language", currentLocale); - Enumeration bundleKeys = labels.getKeys(); - - while (bundleKeys.hasMoreElements()) { - String key = (String)bundleKeys.nextElement(); - String value = labels.getString(key); - //System.out.println("key = " + key + ", " + "value = " + value); - langMap.put(key, value); - } - */ - Properties props = new Properties(); try { props.load( new FileInputStream( "config/Language_" + currentLocale + ".properties") ); @@ -39,9 +26,7 @@ public Lang(){ e.printStackTrace(); } for (Object key : props.keySet() ) { - //String key = (String)bundleKeys.nextElement(); String value = props.getProperty(key.toString()); - //System.out.println("key = " + key + ", " + "value = " + value); langMap.put(key.toString(), value); } diff --git a/src/main/java/com/shamwerks/camwerks/gui/CwCamMeasure.java b/src/main/java/com/shamwerks/camwerks/gui/CwCamMeasure.java index 0828f00..f6cf62f 100644 --- a/src/main/java/com/shamwerks/camwerks/gui/CwCamMeasure.java +++ b/src/main/java/com/shamwerks/camwerks/gui/CwCamMeasure.java @@ -31,16 +31,7 @@ public class CwCamMeasure extends JDialog implements ActionListener{ //, Observe private double normalizeOffset = 0.0; public CwCamMeasure() { - Camshaft camshaft = CamWerks.getInstance().getCamshaft(); -/* - System.out.println("-------------------------"); - System.out.println("Camshaft size=" + camshaft.getNbCams()); - for(int i=0 ; i " + measure); - lblStep.setText( "Step : " + (i+1) + " / " + camshaft.getNbSteps() ); lblCycle.setText( "Cycle : " + (c+1) + " / " + camshaft.getNbCycles() ); lblValue.setText( "Value : " + measure ); diff --git a/src/main/java/com/shamwerks/camwerks/gui/CwMenu.java b/src/main/java/com/shamwerks/camwerks/gui/CwMenu.java index c8b169e..61ad94f 100644 --- a/src/main/java/com/shamwerks/camwerks/gui/CwMenu.java +++ b/src/main/java/com/shamwerks/camwerks/gui/CwMenu.java @@ -169,9 +169,7 @@ private void actionNewCamshaft(){ try { CwNewCamshaft dialog = new CwNewCamshaft(); dialog.setLocationRelativeTo( CamWerks.getInstance().getFrame() ); - System.out.println("aaa"); dialog.setVisible(true); //Blocking!! - System.out.println("bbb"); } catch (Exception e) { e.printStackTrace(); } @@ -203,6 +201,7 @@ private void actionOpenFileCompareTo(){ } private void actionCloseFile(){ + //TODO System.out.println("TO DO!"); } @@ -212,7 +211,6 @@ private void actionSaveCsv(){ fd.setVisible(true); String filename = fd.getFile(); if (filename != null){ - System.out.println("ssss" + filename + " --- " + fd.getDirectory()); CamWerks.getInstance().getCamshaft().saveAsCSV(fd.getDirectory() + filename); } } diff --git a/src/main/java/com/shamwerks/camwerks/gui/CwPanelCamRadialChart.java b/src/main/java/com/shamwerks/camwerks/gui/CwPanelCamRadialChart.java index 8ea6bb4..2ab9803 100644 --- a/src/main/java/com/shamwerks/camwerks/gui/CwPanelCamRadialChart.java +++ b/src/main/java/com/shamwerks/camwerks/gui/CwPanelCamRadialChart.java @@ -65,7 +65,6 @@ public void drawSeries (Graphics2D g2, Rectangle2D dataArea, } } } -System.out.println( "seriesIndex=" + seriesIndex + " / paint=" + lookupSeriesPaint (seriesIndex) ); g2.setPaint (lookupSeriesPaint (seriesIndex)); g2.setStroke (lookupSeriesStroke (seriesIndex)); g2.draw (polyline); @@ -144,7 +143,6 @@ private void updateDatasetFromCamshaft(Camshaft camshaft, boolean isCompare){ } seriesID++; - //sliding window average algorithm : double[] filtered = new double[camshaft.getNbSteps()]; int slidingWindowSize = 9; //must be an odd/uneven number : 1 3 5 7 9... 1 means no average, just raw data @@ -157,21 +155,6 @@ private void updateDatasetFromCamshaft(Camshaft camshaft, boolean isCompare){ filtered[j] = total / slidingWindowSize; } - /* - **** MatLab Algorith : enveloppe of a family of lines **** - base = 12; - N = size(raw, 1); - dth = .6; - th = dth * raw(:, 1)' / 180 * pi; - l = raw(:, 2)' + base; - dl = diff(l) ./ diff(th); - dl = [ dl ( l(1)-l(end) )/( th(1)+360-th(end) ) ]; - cth = cos(th); - sth = sin(th); - x = l.*cth - dl.*sth; - y = l.*sth + dl.*cth; - */ - double dth = (360.0d / camshaft.getNbSteps()); XYSeries xys = new XYSeries(legend + ((isCompare)?"_Compare":"")); for (int j = 0; j < camshaft.getNbSteps() ; j++) { diff --git a/src/main/java/com/shamwerks/camwerks/gui/CwPanelDetails.java b/src/main/java/com/shamwerks/camwerks/gui/CwPanelDetails.java index e1193a7..ca99039 100644 --- a/src/main/java/com/shamwerks/camwerks/gui/CwPanelDetails.java +++ b/src/main/java/com/shamwerks/camwerks/gui/CwPanelDetails.java @@ -47,7 +47,6 @@ public CwPanelDetails() { } fileContent = parseHtmlTags(fileContent); - //System.out.println(fileContent); detailsEditPane.setText( fileContent ); add(detailsEditPane); @@ -66,7 +65,6 @@ public void updateCamshaftDetails(){ fileContent = parseHtmlTags(fileContent); - //System.out.println("fileContent = " + fileContent); detailsEditPane.setText(fileContent); } diff --git a/src/main/java/com/shamwerks/camwerks/gui/CwPanelLineChart.java b/src/main/java/com/shamwerks/camwerks/gui/CwPanelLineChart.java index e1bea41..2ddee90 100644 --- a/src/main/java/com/shamwerks/camwerks/gui/CwPanelLineChart.java +++ b/src/main/java/com/shamwerks/camwerks/gui/CwPanelLineChart.java @@ -130,8 +130,6 @@ public void updateDatasetFromCamshaft_OriginalOK(){ public void updateDatasetFromCamshaft(){ series.removeAllSeries(); updateDatasetFromCamshaft( CamWerks.getInstance().getCamshaft() , false ); - updateDatasetFromCamshaft( CamWerks.getInstance().getCamshaftCompareTo() , true); - String chartTitle = CamWerks.getInstance().getCamshaft().getName(); if(CamWerks.getInstance().getCamshaftCompareTo() != null){ @@ -145,7 +143,6 @@ public void updateDatasetFromCamshaft(){ private void updateDatasetFromCamshaft(Camshaft camshaft, boolean isCompare){ - System.out.println(camshaft); if(camshaft == null) return; XYPlot xyPlot = (XYPlot) chart.getPlot(); @@ -173,8 +170,9 @@ private void updateDatasetFromCamshaft(Camshaft camshaft, boolean isCompare){ renderer.setSeriesPaint(seriesID, Color.green); } } + seriesID++; - XYSeries localXYSeries = new XYSeries(legend + ((isCompare)?"_Compare"+seriesID:"")); + XYSeries localXYSeries = new XYSeries(legend + ((isCompare)?"_Compare":"")); for (int j = 0; j < camshaft.getNbSteps() ; j++) { double x = j * (360.0d / camshaft.getNbSteps()) * 2; @@ -182,7 +180,6 @@ private void updateDatasetFromCamshaft(Camshaft camshaft, boolean isCompare){ } series.addSeries(localXYSeries); - seriesID++; } } } diff --git a/src/main/java/com/shamwerks/camwerks/pojo/Camshaft.java b/src/main/java/com/shamwerks/camwerks/pojo/Camshaft.java index c20c606..fae155d 100644 --- a/src/main/java/com/shamwerks/camwerks/pojo/Camshaft.java +++ b/src/main/java/com/shamwerks/camwerks/pojo/Camshaft.java @@ -84,8 +84,6 @@ public static Camshaft parseCamFile(String camFilePath){ camshaft.addCam( cam ); } } - - System.out.println("================\n" + camshaft + "\n================"); return camshaft; } @@ -113,7 +111,6 @@ public void saveAsCSV(String filePath){ } content.append( "\r\n"); } - System.out.println(content); //TODO !!!! }