Merge branch 'master' into develop

.gitignore

@@ -34,10 +34,10 @@ aclocal.m4
 DSView/ui_*.h
 DSView/DSView
 DSView/install_manifest.txt
+DSView/qrc_DSView.cpp
 
-moc_*.cxx
-moc_*.cxx_parameters
-qrc_*.cxx
+moc_*.cpp
+moc_*.cpp_parameters
 
 libsigrok4DSL/version.h
 

DSView/CMakeLists.txt

@@ -103,7 +103,7 @@ set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab")
 
 set(DS_VERSION_MAJOR 0)
 set(DS_VERSION_MINOR 9)
-set(DS_VERSION_MICRO 4)
+set(DS_VERSION_MICRO 5)
 set(DS_VERSION_STRING
 	${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO}
 )

DSView/pv/dock/triggerdock.cpp

@@ -267,7 +267,6 @@ void TriggerDock::paintEvent(QPaintEvent *)
 
 void TriggerDock::simple_trigger()
 {
-    int i;
     stages_label->setDisabled(true);
     stages_comboBox->setDisabled(true);
     _adv_tabWidget->setDisabled(true);

DSView/pv/toolbars/samplingbar.cpp

@@ -494,8 +494,6 @@ void SamplingBar::commit_sample_rate()
 void SamplingBar::on_samplecount_sel(int index)
 {
     uint64_t sample_count = 0;
-    uint64_t max_sample_count = 0;
-    bool stream_mode = false;
 
     qDebug() << "index: " << index;
     if (index >= 0)
@@ -520,10 +518,6 @@ void SamplingBar::on_samplecount_sel(int index)
 void SamplingBar::on_samplerate_sel(int index)
 {
     uint64_t sample_rate = 0;
-    //uint64_t last_sample_rate = 0;
-    uint64_t max_sample_count = 0;
-    uint64_t sample_count = 0;
-    bool stream_mode = false;
 
     if (index >= 0)
         sample_rate = _sample_rate.itemData(

DSView/pv/view/dsosignal.cpp

@@ -426,15 +426,15 @@ bool DsoSignal::load_settings()
     GVariant* gvar;
 
     // -- enable
-    bool enable;
-    gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_EN_CH);
-    if (gvar != NULL) {
-        enable = g_variant_get_boolean(gvar);
-        g_variant_unref(gvar);
-    } else {
-        qDebug() << "ERROR: config_get SR_CONF_EN_CH failed.";
-        return false;
-    }
+    //bool enable;
+    //gvar = _dev_inst->get_config(_probe, NULL, SR_CONF_EN_CH);
+    //if (gvar != NULL) {
+    //    enable = g_variant_get_boolean(gvar);
+    //    g_variant_unref(gvar);
+    //} else {
+    //    qDebug() << "ERROR: config_get SR_CONF_EN_CH failed.";
+    //    return false;
+    //}
 
     // -- hdiv
     uint64_t hdiv;

DSView/pv/view/header.cpp

@@ -140,7 +140,6 @@ void Header::mouseDoubleClickEvent(QMouseEvent *event)
 
     const vector< boost::shared_ptr<Trace> > traces(
         _view.get_traces());
-    int action;
 
     if (event->button() & Qt::LeftButton) {
         _mouse_down_point = event->pos();

INSTALL

@@ -49,7 +49,7 @@ Arch:
 
 Step2: Get the DSView source code
 
- $ clone git://github.com/DreamSourceLab/DSView
+ $ git clone git://github.com/DreamSourceLab/DSView
 
 Step3: Building
  

NEWS

-0.94 (2015-06-29)
------------------
- * add session load/store function
- * add drag-and-drop effect in viewport window
- * improve display effect of dock windows, add scroll bar
- * fix other GUI issues
-
- --for logic analyzer
- * upgrade advance trigger counter from 16bit to 32bit
- * add serial trigger function
- * fix memory leakage issue when load *.dsl files
- * fix delete group signal issue when no data captured
-
- --for oscilloscope
- * add measurement of width, period, frequency and duty cycle
- * fix instant capture issue @ demo mode
- * add trigger hold-off time function
- * fix channels enable/disable issue
- * fix data error issue of instant capture before normal capture
- * fix trigger position issue when only one channel enabled
- * fix trigger level can't be changed issue when only one channel enabled
-
-0.93 (2015-05-08)
------------------
- * Upgrade to qt5 library
- * Support stdc++11
- * Improve measure function @ LA mode
- * Add duty cycle measure @ LA mode
- * Fix out of range issue @ LA mode
- * Add export funtion, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
- * Add x1/x10/x100 probe options @ DSO mode
- * Add measure function @ DSO mode
- * Add voltage display of trigger value @ DSO mode
- * Fix wave disappear issue @ DSO mode
- * Fix trigger issue @ DSO stream mode
- * Fix data repeat when set trigger @ LA stream mode
- * Keep channel settings when reload occured @ LA mode
- * Fix decoder issue when capture part of data @ LA mode
- * Fix stack decoder add issue @ LA mode
- * Fix other bugs
-
-0.92 (2015-04-15)
------------------
- * Add DSLogic Pro and DSCope support
- * Add Stream mode to DSLogic & DSLogic Pro
- * Support up to 1G samples @ LA mode
- * Add zero adjustment @ Oscilloscope mode
- * Support zero skew parameters restore
- * Enhance stbility
- * Fix other bugs
-
-0.4 (2014-09-24)
------------------
- * Add protocol decoders (38) support
- * Improve the hardware configuration under various platforms
- * Add different thresholds support
- * Add options for input filter under logic analyzer mode
- * Add instant capture(trigger ignore) under logic analyzer mode
- * Ad detail capture status display under logic abrary
- * Support stdc++11
- * Improve measure function @ LA mode
- * Add duty cycle measure @ LA mode
- * Fix out of range issue @ LA mode
- * Add export funtion, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
- * Add x1/x10/x100 probe options @ DSO mode
- * Add measure function @ DSO mode
- * Add voltage display of trigger value @ DSO mode
- * Fix wave disappear issue @ DSO mode
- * Fix trigger issue @ DSO stream mode
- * Fix data repeat when set trigger @ LA stream mode
- * Keep channel settings when reload occured @ LA mode
- * Fix decoder issue when capture part of data @ LA mode
- * Fix stack decoder add issue @ LA mode
- * Fix other bugsnalyzer mode
- * Add quick button for mode shift
- * Redesign the GUI for oscilloscope
- * Add flexible sample rate support under oscilloscope mode
- * Fix trigger value setting issue
- * Improve trigger method under oscilloscope mode
- * Add shortcut keys for major operations
- * Fix other bugs
-
-0.3 (2014-06-29)
------------------
- * Add DSLogic Oscilloscope module support.
- * Fix data display issue when not all channels be enabled.
- * Fix issue of data mirrored to other channels.
- * Fix radiobutton/checkbox display issue under certain windows theme.
- * Add new simple trigger type
- * Fix bugs of trigger setting and detection
- * Fix other minior issues.
- * Clean up the git repository
-
-0.2.1 (2014-05-08)
-------------------
- * Add wireless extension hardware support.
- * Fix libusb_error_io issue on Linux when sample rate >= 100MHz.
- * Fix channel enable/disable bug.
- * Fix device options config issue.
- * Fix some display issues of UI.
-
-0.2.0 (2014-04-13)
-------------------
- * Add DSLogic hardware support.
-
-0.1.0 (2013-12-15)
-------------------
- * Initial release.
-
-
- 
- 
+0.95 (2015-12-14)
+-----------------
+ --for logic analyzer
+ *add RLE compress mode
+ *improve mode setting strategy, fix channel number
+ *add edge count function
+ *fix memory leakage when run protocol decoder
+ *add signal height setting, improve display issue
+ *fix crash issue when add group signal
+ *fix channel enable/disable issue
+ *fix channel display issue when load file input
+ *add cursor by mouse double-click
+ *fix other issues
+
+ --for oscilloscope
+ *add file export/load function
+ *fix wait time issue when trigger setted
+ *improve display of signal measure
+ *add Vrms/Vmean/Vp-p measure
+ *fix setting issue when load session
+ *imporve add/del of measure ruler
+ *fix other issues
+
+0.94 (2015-06-29)
+-----------------
+ * add session load/store function
+ * add drag-and-drop effect in viewport window
+ * improve display effect of dock windows, add scroll bar
+ * fix other GUI issues
+
+ --for logic analyzer
+ * upgrade advance trigger counter from 16bit to 32bit
+ * add serial trigger function
+ * fix memory leakage issue when load *.dsl files
+ * fix delete group signal issue when no data captured
+
+ --for oscilloscope
+ * add measurement of width, period, frequency and duty cycle
+ * fix instant capture issue @ demo mode
+ * add trigger hold-off time function
+ * fix channels enable/disable issue
+ * fix data error issue of instant capture before normal capture
+ * fix trigger position issue when only one channel enabled
+ * fix trigger level can't be changed issue when only one channel enabled
+
+0.93 (2015-05-08)
+-----------------
+ * Upgrade to qt5 library
+ * Support stdc++11
+ * Improve measure function @ LA mode
+ * Add duty cycle measure @ LA mode
+ * Fix out of range issue @ LA mode
+ * Add export funtion, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
+ * Add x1/x10/x100 probe options @ DSO mode
+ * Add measure function @ DSO mode
+ * Add voltage display of trigger value @ DSO mode
+ * Fix wave disappear issue @ DSO mode
+ * Fix trigger issue @ DSO stream mode
+ * Fix data repeat when set trigger @ LA stream mode
+ * Keep channel settings when reload occured @ LA mode
+ * Fix decoder issue when capture part of data @ LA mode
+ * Fix stack decoder add issue @ LA mode
+ * Fix other bugs
+
+0.92 (2015-04-15)
+-----------------
+ * Add DSLogic Pro and DSCope support
+ * Add Stream mode to DSLogic & DSLogic Pro
+ * Support up to 1G samples @ LA mode
+ * Add zero adjustment @ Oscilloscope mode
+ * Support zero skew parameters restore
+ * Enhance stbility
+ * Fix other bugs
+
+0.4 (2014-09-24)
+-----------------
+ * Add protocol decoders (38) support
+ * Improve the hardware configuration under various platforms
+ * Add different thresholds support
+ * Add options for input filter under logic analyzer mode
+ * Add instant capture(trigger ignore) under logic analyzer mode
+ * Ad detail capture status display under logic abrary
+ * Support stdc++11
+ * Improve measure function @ LA mode
+ * Add duty cycle measure @ LA mode
+ * Fix out of range issue @ LA mode
+ * Add export funtion, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
+ * Add x1/x10/x100 probe options @ DSO mode
+ * Add measure function @ DSO mode
+ * Add voltage display of trigger value @ DSO mode
+ * Fix wave disappear issue @ DSO mode
+ * Fix trigger issue @ DSO stream mode
+ * Fix data repeat when set trigger @ LA stream mode
+ * Keep channel settings when reload occured @ LA mode
+ * Fix decoder issue when capture part of data @ LA mode
+ * Fix stack decoder add issue @ LA mode
+ * Fix other bugsnalyzer mode
+ * Add quick button for mode shift
+ * Redesign the GUI for oscilloscope
+ * Add flexible sample rate support under oscilloscope mode
+ * Fix trigger value setting issue
+ * Improve trigger method under oscilloscope mode
+ * Add shortcut keys for major operations
+ * Fix other bugs
+
+0.3 (2014-06-29)
+-----------------
+ * Add DSLogic Oscilloscope module support.
+ * Fix data display issue when not all channels be enabled.
+ * Fix issue of data mirrored to other channels.
+ * Fix radiobutton/checkbox display issue under certain windows theme.
+ * Add new simple trigger type
+ * Fix bugs of trigger setting and detection
+ * Fix other minior issues.
+ * Clean up the git repository
+
+0.2.1 (2014-05-08)
+------------------
+ * Add wireless extension hardware support.
+ * Fix libusb_error_io issue on Linux when sample rate >= 100MHz.
+ * Fix channel enable/disable bug.
+ * Fix device options config issue.
+ * Fix some display issues of UI.
+
+0.2.0 (2014-04-13)
+------------------
+ * Add DSLogic hardware support.
+
+0.1.0 (2013-12-15)
+------------------
+ * Initial release.
+
+
+ 
+