SF.net SVN: jazzplusplus:[974] trunk/jazz/src/Harmony.cpp

[<pst...@us...>]

Revision: 974
          http://sourceforge.net/p/jazzplusplus/code/974
Author:   pstieber
Date:     2013-03-18 18:54:14 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
1. Used JZEventWindow::AreEventsSelected() instead of
gpTrackWindow->mpSnapSel->IsSelected().
2. Updated some variable names and fixed line wrap.

Modified Paths:
--------------
    trunk/jazz/src/Harmony.cpp

Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp	2013-03-18 18:51:59 UTC (rev 973)
+++ trunk/jazz/src/Harmony.cpp	2013-03-18 18:54:14 UTC (rev 974)
@@ -1426,11 +1426,13 @@
     wxMessageBox("define a chord sequence first", "error", wxOK);
     return;
   }
-  if (gpTrackWindow->EventsSelected("please select destination range in track window"))
+  if (
+    gpTrackWindow->EventsSelected(
+      "please select destination range in track window"))
   {
     wxBeginBusyCursor();
-    JZHarmonyBrowserAnalyzer analyzer(mSequence, mSequenceCount);
-    analyzer.Transpose(gpTrackWindow->mpFilter, transpose_res);
+    JZHarmonyBrowserAnalyzer HarmonyBrowserAnalyzer(mSequence, mSequenceCount);
+    HarmonyBrowserAnalyzer.Transpose(gpTrackWindow->mpFilter, transpose_res);
     wxEndBusyCursor();
   }
 }
@@ -1494,11 +1496,16 @@
       break;
 
     case MEN_ANALYZE:
-      if (gpTrackWindow->EventsSelected("please select source range in track window"))
+      if (
+        gpTrackWindow->EventsSelected(
+          "please select source range in track window"))
       {
         wxBeginBusyCursor();
-        JZHarmonyBrowserAnalyzer analyzer(mSequence, (int)SEQMAX);
-        mSequenceCount = analyzer.Analyze(gpTrackWindow->mpFilter, analyze_res);
+        JZHarmonyBrowserAnalyzer
+          HarmonyBrowserAnalyzer(mSequence, (int)SEQMAX);
+        mSequenceCount = HarmonyBrowserAnalyzer.Analyze(
+          gpTrackWindow->mpFilter,
+          analyze_res);
         Refresh();
         wxEndBusyCursor();
       }
@@ -1520,13 +1527,14 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-JZHarmonyBrowserAnalyzer * JZHarmonyBrowserCanvas::GetAnalyzer()
+JZHarmonyBrowserAnalyzer* JZHarmonyBrowserCanvas::GetAnalyzer()
 {
-  if (mSequenceCount > 0 && gpTrackWindow->mpSnapSel->IsSelected())
+  if (mSequenceCount > 0 && gpTrackWindow->AreEventsSelected())
   {
-    JZHarmonyBrowserAnalyzer *analyzer = new JZHarmonyBrowserAnalyzer(mSequence, mSequenceCount);
-    analyzer->Init(gpTrackWindow->mpFilter, transpose_res);
-    return analyzer;
+    JZHarmonyBrowserAnalyzer* pHarmonyBrowserAnalyzer =
+      new JZHarmonyBrowserAnalyzer(mSequence, mSequenceCount);
+    pHarmonyBrowserAnalyzer->Init(gpTrackWindow->mpFilter, transpose_res);
+    return pHarmonyBrowserAnalyzer;
   }
   return 0;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.