/[svn]/gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2550 by schoenebeck, Wed May 14 01:31:30 2014 UTC revision 3300 by schoenebeck, Sun Jul 9 18:15:02 2017 UTC
# Line 1  Line 1 
1  /*  /*
2      Copyright (c) 2014 Christian Schoenebeck      Copyright (c) 2014-2017 Christian Schoenebeck
3            
4      This file is part of "gigedit" and released under the terms of the      This file is part of "gigedit" and released under the terms of the
5      GNU General Public License version 2.      GNU General Public License version 2.
6  */  */
7    
8    #include "global.h"
9  #include "CombineInstrumentsDialog.h"  #include "CombineInstrumentsDialog.h"
10    
11  // enable this for debug messages being printed while combining the instruments  // enable this for debug messages being printed while combining the instruments
12  #define DEBUG_COMBINE_INSTRUMENTS 0  #define DEBUG_COMBINE_INSTRUMENTS 0
13    
14  #include "global.h"  #include "compat.h"
15    
16  #include <set>  #include <set>
17  #include <iostream>  #include <iostream>
18  #include <assert.h>  #include <assert.h>
19    #include <stdarg.h>
20    #include <string.h>
21    
22  #include <glibmm/ustring.h>  #include <glibmm/ustring.h>
23  #include <gtkmm/stock.h>  #include <gtkmm/stock.h>
24  #include <gtkmm/messagedialog.h>  #include <gtkmm/messagedialog.h>
25    #include <gtkmm/label.h>
26    
27  Glib::ustring gig_to_utf8(const gig::String& gig_string);  Glib::ustring dimTypeAsString(gig::dimension_t d);
28    
29    typedef std::vector< std::pair<gig::Instrument*, gig::Region*> > OrderedRegionGroup;
30  typedef std::map<gig::Instrument*, gig::Region*> RegionGroup;  typedef std::map<gig::Instrument*, gig::Region*> RegionGroup;
31  typedef std::map<DLS::range_t,RegionGroup> RegionGroups;  typedef std::map<DLS::range_t,RegionGroup> RegionGroups;
32    
33  typedef std::vector<DLS::range_t> DimensionZones;  typedef std::vector<DLS::range_t> DimensionZones;
34  typedef std::map<gig::dimension_t,DimensionZones> Dimensions;  typedef std::map<gig::dimension_t,DimensionZones> Dimensions;
35    
 typedef std::map<gig::dimension_t,int> DimensionCase;  
   
36  typedef std::map<gig::dimension_t, int> DimensionRegionUpperLimits;  typedef std::map<gig::dimension_t, int> DimensionRegionUpperLimits;
37    
38    typedef std::set<Glib::ustring> Warnings;
39    
40    ///////////////////////////////////////////////////////////////////////////
41    // private static data
42    
43    static Warnings g_warnings;
44    
45  ///////////////////////////////////////////////////////////////////////////  ///////////////////////////////////////////////////////////////////////////
46  // private functions  // private functions
47    
# Line 47  static void printRanges(const RegionGrou Line 57  static void printRanges(const RegionGrou
57  #endif  #endif
58    
59  /**  /**
60     * Store a warning message that shall be stored and displayed to the user as a
61     * list of warnings after the overall operation has finished. Duplicate warning
62     * messages are automatically eliminated.
63     */
64    inline void addWarning(const char* fmt, ...) {
65        va_list arg;
66        va_start(arg, fmt);
67        const int SZ = 255 + strlen(fmt);
68        char* buf = new char[SZ];
69        vsnprintf(buf, SZ, fmt, arg);
70        Glib::ustring s = buf;
71        delete [] buf;
72        va_end(arg);
73        std::cerr << _("WARNING:") << " " << s << std::endl << std::flush;
74        g_warnings.insert(s);
75    }
76    
77    /**
78   * If the two ranges overlap, then this function returns the smallest point   * If the two ranges overlap, then this function returns the smallest point
79   * within that overlapping zone. If the two ranges do not overlap, then this   * within that overlapping zone. If the two ranges do not overlap, then this
80   * function will return -1 instead.   * function will return -1 instead.
# Line 66  inline int smallestOverlapPoint(const DL Line 94  inline int smallestOverlapPoint(const DL
94   *          found with a range member point >= iStart   *          found with a range member point >= iStart
95   */   */
96  static int findLowestRegionPoint(std::vector<gig::Instrument*>& instruments, int iStart) {  static int findLowestRegionPoint(std::vector<gig::Instrument*>& instruments, int iStart) {
97      DLS::range_t searchRange = { iStart, 127 };      DLS::range_t searchRange = { uint16_t(iStart), 127 };
98      int result = -1;      int result = -1;
99      for (uint i = 0; i < instruments.size(); ++i) {      for (uint i = 0; i < instruments.size(); ++i) {
100          gig::Instrument* instr = instruments[i];          gig::Instrument* instr = instruments[i];
# Line 88  static int findLowestRegionPoint(std::ve Line 116  static int findLowestRegionPoint(std::ve
116   *          with a range end >= iStart   *          with a range end >= iStart
117   */   */
118  static int findFirstRegionEnd(std::vector<gig::Instrument*>& instruments, int iStart) {  static int findFirstRegionEnd(std::vector<gig::Instrument*>& instruments, int iStart) {
119      DLS::range_t searchRange = { iStart, 127 };      DLS::range_t searchRange = { uint16_t(iStart), 127 };
120      int result = -1;      int result = -1;
121      for (uint i = 0; i < instruments.size(); ++i) {      for (uint i = 0; i < instruments.size(); ++i) {
122          gig::Instrument* instr = instruments[i];          gig::Instrument* instr = instruments[i];
# Line 131  static RegionGroup getAllRegionsWhichOve Line 159  static RegionGroup getAllRegionsWhichOve
159          std::vector<gig::Region*> v = getAllRegionsWhichOverlapRange(instr, range);          std::vector<gig::Region*> v = getAllRegionsWhichOverlapRange(instr, range);
160          if (v.empty()) continue;          if (v.empty()) continue;
161          if (v.size() > 1) {          if (v.size() > 1) {
162              std::cerr << "WARNING: More than one region found!" << std::endl;              addWarning("More than one region found!");
163          }          }
164          group[instr] = v[0];          group[instr] = v[0];
165      }      }
# Line 141  static RegionGroup getAllRegionsWhichOve Line 169  static RegionGroup getAllRegionsWhichOve
169  /** @brief Identify required regions.  /** @brief Identify required regions.
170   *   *
171   * Takes a list of @a instruments as argument (which are planned to be combined   * Takes a list of @a instruments as argument (which are planned to be combined
172   * as layers in one single new instrument) and fulfills the following tasks:   * as separate dimension zones of a certain dimension into one single new
173     * instrument) and fulfills the following tasks:
174   *   *
175   * - 1. Identification of total amount of regions required to create a new   * - 1. Identification of total amount of regions required to create a new
176   *      instrument to become a layered version of the given instruments.   *      instrument to become a combined version of the given instruments.
177   * - 2. Precise key range of each of those identified required regions to be   * - 2. Precise key range of each of those identified required regions to be
178   *      created in that new instrument.   *      created in that new instrument.
179   * - 3. Grouping the original source regions of the given original instruments   * - 3. Grouping the original source regions of the given original instruments
# Line 163  static RegionGroups groupByRegionInterse Line 192  static RegionGroups groupByRegionInterse
192          iStart = findLowestRegionPoint(instruments, iStart);          iStart = findLowestRegionPoint(instruments, iStart);
193          if (iStart < 0) break;          if (iStart < 0) break;
194          const int iEnd = findFirstRegionEnd(instruments, iStart);          const int iEnd = findFirstRegionEnd(instruments, iStart);
195          DLS::range_t range = { iStart, iEnd };          DLS::range_t range = { uint16_t(iStart), uint16_t(iEnd) };
196          intersections.push_back(range);          intersections.push_back(range);
197          iStart = iEnd + 1;          iStart = iEnd + 1;
198      }      }
# Line 175  static RegionGroups groupByRegionInterse Line 204  static RegionGroups groupByRegionInterse
204          if (!group.empty())          if (!group.empty())
205              groups[range] = group;              groups[range] = group;
206          else          else
207              std::cerr << "WARNING: empty region group!" << std::endl;              addWarning("Empty region group!");
208      }      }
209    
210      return groups;      return groups;
# Line 234  static Dimensions getDimensionsForRegion Line 263  static Dimensions getDimensionsForRegion
263               itNums != it->second.end(); ++itNums)               itNums != it->second.end(); ++itNums)
264          {          {
265              const int iUpperLimit = *itNums;              const int iUpperLimit = *itNums;
266              DLS::range_t range = { iLow, iUpperLimit };              DLS::range_t range = { uint16_t(iLow), uint16_t(iUpperLimit) };
267              dims[type].push_back(range);              dims[type].push_back(range);
268              iLow = iUpperLimit + 1;              iLow = iUpperLimit + 1;
269          }          }
# Line 243  static Dimensions getDimensionsForRegion Line 272  static Dimensions getDimensionsForRegion
272      return dims;      return dims;
273  }  }
274    
 inline int getDimensionIndex(gig::dimension_t type, gig::Region* rgn) {  
     for (uint i = 0; i < rgn->Dimensions; ++i)  
         if (rgn->pDimensionDefinitions[i].dimension == type)  
             return i;  
     return -1;  
 }  
   
275  static void fillDimValues(uint* values/*[8]*/, DimensionCase dimCase, gig::Region* rgn, bool bShouldHaveAllDimensionsPassed) {  static void fillDimValues(uint* values/*[8]*/, DimensionCase dimCase, gig::Region* rgn, bool bShouldHaveAllDimensionsPassed) {
276      #if DEBUG_COMBINE_INSTRUMENTS      #if DEBUG_COMBINE_INSTRUMENTS
277      printf("dimvalues = { ");      printf("dimvalues = { ");
# Line 266  static void fillDimValues(uint* values/* Line 288  static void fillDimValues(uint* values/*
288          #endif          #endif
289      }      }
290      #if DEBUG_COMBINE_INSTRUMENTS      #if DEBUG_COMBINE_INSTRUMENTS
291      printf("\n");      printf("}\n");
292      #endif      #endif
293  }  }
294    
# Line 291  static void restoreDimensionRegionUpperL Line 313  static void restoreDimensionRegionUpperL
313      }      }
314  }  }
315    
 /**  
  * Returns the sum of all bits of all dimensions defined before the given  
  * dimensions (@a type). This allows to access cases of that particular  
  * dimension directly.  
  *  
  * @param type - dimension that shall be used  
  * @param rgn - parent region of that dimension  
  */  
 inline int baseBits(gig::dimension_t type, gig::Region* rgn) {  
     int previousBits = 0;  
     for (uint i = 0; i < rgn->Dimensions; ++i) {  
         if (rgn->pDimensionDefinitions[i].dimension == type) break;  
         previousBits += rgn->pDimensionDefinitions[i].bits;  
     }  
     return previousBits;  
 }  
   
316  inline int dimensionRegionIndex(gig::DimensionRegion* dimRgn) {  inline int dimensionRegionIndex(gig::DimensionRegion* dimRgn) {
317      gig::Region* rgn = dimRgn->GetParent();      gig::Region* rgn = dimRgn->GetParent();
318      int sz = sizeof(rgn->pDimensionRegions) / sizeof(gig::DimensionRegion*);      int sz = sizeof(rgn->pDimensionRegions) / sizeof(gig::DimensionRegion*);
# Line 340  static DimensionZones preciseDimensionZo Line 345  static DimensionZones preciseDimensionZo
345      const gig::dimension_def_t& def = rgn->pDimensionDefinitions[iDimension];      const gig::dimension_def_t& def = rgn->pDimensionDefinitions[iDimension];
346      int iDimRgn = dimensionRegionIndex(dimRgn);      int iDimRgn = dimensionRegionIndex(dimRgn);
347      int iBaseBits = baseBits(type, rgn);      int iBaseBits = baseBits(type, rgn);
348        assert(iBaseBits >= 0);
349      int mask = ~(((1 << def.bits) - 1) << iBaseBits);      int mask = ~(((1 << def.bits) - 1) << iBaseBits);
350    
351      #if DEBUG_COMBINE_INSTRUMENTS      #if DEBUG_COMBINE_INSTRUMENTS
# Line 351  static DimensionZones preciseDimensionZo Line 357  static DimensionZones preciseDimensionZo
357          gig::DimensionRegion* dimRgn2 =          gig::DimensionRegion* dimRgn2 =
358              rgn->pDimensionRegions[ (iDimRgn & mask) | ( z << iBaseBits) ];              rgn->pDimensionRegions[ (iDimRgn & mask) | ( z << iBaseBits) ];
359          int iHigh = dimRgn2->DimensionUpperLimits[iDimension];          int iHigh = dimRgn2->DimensionUpperLimits[iDimension];
360          DLS::range_t range = { iLow, iHigh};          DLS::range_t range = { uint16_t(iLow), uint16_t(iHigh) };
361          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
362          printf("%d..%d, ", iLow, iHigh);          printf("%d..%d, ", iLow, iHigh);
363          fflush(stdout);          fflush(stdout);
# Line 373  struct CopyAssignSchedEntry { Line 379  struct CopyAssignSchedEntry {
379  };  };
380  typedef std::vector<CopyAssignSchedEntry> CopyAssignSchedule;  typedef std::vector<CopyAssignSchedEntry> CopyAssignSchedule;
381    
382  /** @brief Copy all DimensionRegions from source Region to target Region.  /** @brief Schedule copying DimensionRegions from source Region to target Region.
383   *   *
384   * Copies the entire articulation informations (including sample reference of   * Schedules copying the entire articulation informations (including sample
385   * course) from all individual DimensionRegions of source Region @a inRgn to   * reference) from all individual DimensionRegions of source Region @a inRgn to
386   * target Region @a outRgn. There are no dimension regions created during this   * target Region @a outRgn. It is expected that the required dimensions (thus
387   * task. It is expected that the required dimensions (thus the required   * the required dimension regions) were already created before calling this
388   * dimension regions) were already created before calling this function.   * function.
389   *   *
390   * To be precise, it does the task above only for the layer selected by   * To be precise, it does the task above only for the dimension zones defined by
391   * @a iSrcLayer and @a iDstLayer. All dimensions regions of other layers that   * the three arguments @a mainDim, @a iSrcMainBit, @a iDstMainBit, which reflect
392   * may exist, will not be copied by one single call of this function. So if   * a selection which dimension zones shall be copied. All other dimension zones
393   * there is a layer dimension, this function needs to be called several times.   * will not be scheduled to be copied by a single call of this function. So this
394     * function needs to be called several time in case all dimension regions shall
395     * be copied of the entire region (@a inRgn, @a outRgn).
396   *   *
397   * @param outRgn - where the dimension regions shall be copied to   * @param outRgn - where the dimension regions shall be copied to
398   * @param inRgn - all dimension regions that shall be copied from   * @param inRgn - all dimension regions that shall be copied from
399   * @param dims - precise dimension definitions of target region   * @param dims - precise dimension definitions of target region
400   * @param iDstLayer - layer index of destination region where the dimension   * @param mainDim - this dimension type, in combination with @a iSrcMainBit and
401   *                    regions shall be copied to   *                  @a iDstMainBit defines a selection which dimension region
402   * @param iSrcLayer - layer index of the source region where the dimension   *                  zones shall be copied by this call of this function
403   *                    regions shall be copied from   * @param iDstMainBit - destination bit of @a mainDim
404     * @param iSrcMainBit - source bit of @a mainDim
405     * @param schedule - list of all DimensionRegion copy operations which is filled
406     *                   during the nested loops / recursions of this function call
407   * @param dimCase - just for internal purpose (function recursion), don't pass   * @param dimCase - just for internal purpose (function recursion), don't pass
408   *                  anything here, this function will call itself recursively   *                  anything here, this function will call itself recursively
409   *                  will fill this container with concrete dimension values for   *                  will fill this container with concrete dimension values for
410   *                  selecting the precise dimension regions during its task   *                  selecting the precise dimension regions during its task
  * @param schedule - just for internal purpose (function recursion), don't pass  
                      anything here: list of all DimensionRegion copy operations  
  *                   which is filled during the nested loops / recursions of  
  *                   this function call, they will be peformed after all  
  *                   function recursions have been completed  
411   */   */
412  static void copyDimensionRegions(gig::Region* outRgn, gig::Region* inRgn, Dimensions dims, int iDstLayer, int iSrcLayer, DimensionCase dimCase = DimensionCase(), CopyAssignSchedule* schedule = NULL) {  static void scheduleCopyDimensionRegions(gig::Region* outRgn, gig::Region* inRgn,
413      const bool isHighestLevelOfRecursion = !schedule;                                   Dimensions dims, gig::dimension_t mainDim,
414                                     int iDstMainBit, int iSrcMainBit,
415      if (isHighestLevelOfRecursion)                                   CopyAssignSchedule* schedule,
416          schedule = new CopyAssignSchedule;                                   DimensionCase dimCase = DimensionCase())
417    {
418      if (dims.empty()) { // reached deepest level of function recursion ...      if (dims.empty()) { // reached deepest level of function recursion ...
419          CopyAssignSchedEntry e;          CopyAssignSchedEntry e;
420    
# Line 417  static void copyDimensionRegions(gig::Re Line 423  static void copyDimensionRegions(gig::Re
423          uint dstDimValues[8] = {};          uint dstDimValues[8] = {};
424          DimensionCase srcDimCase = dimCase;          DimensionCase srcDimCase = dimCase;
425          DimensionCase dstDimCase = dimCase;          DimensionCase dstDimCase = dimCase;
426          srcDimCase[gig::dimension_layer] = iSrcLayer;          srcDimCase[mainDim] = iSrcMainBit;
427          dstDimCase[gig::dimension_layer] = iDstLayer;          dstDimCase[mainDim] = iDstMainBit;
428    
429          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
430          printf("-------------------------------\n");          printf("-------------------------------\n");
431            printf("iDstMainBit=%d iSrcMainBit=%d\n", iDstMainBit, iSrcMainBit);
432          #endif          #endif
433    
434          // first select source & target dimension region with an arbitrary          // first select source & target dimension region with an arbitrary
# Line 436  static void copyDimensionRegions(gig::Re Line 443  static void copyDimensionRegions(gig::Re
443          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
444          printf("dst "); fflush(stdout);          printf("dst "); fflush(stdout);
445          #endif          #endif
446          fillDimValues(dstDimValues, dstDimCase, outRgn, true);          fillDimValues(dstDimValues, dstDimCase, outRgn, false);
447          gig::DimensionRegion* srcDimRgn = inRgn->GetDimensionRegionByValue(srcDimValues);          gig::DimensionRegion* srcDimRgn = inRgn->GetDimensionRegionByValue(srcDimValues);
448          gig::DimensionRegion* dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);          gig::DimensionRegion* dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
449          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
450          printf("iDstLayer=%d iSrcLayer=%d\n", iDstLayer, iSrcLayer);          printf("iDstMainBit=%d iSrcMainBit=%d\n", iDstMainBit, iSrcMainBit);
451          printf("srcDimRgn=%lx dstDimRgn=%lx\n", (uint64_t)srcDimRgn, (uint64_t)dstDimRgn);          printf("srcDimRgn=%lx dstDimRgn=%lx\n", (uint64_t)srcDimRgn, (uint64_t)dstDimRgn);
452          printf("srcSample='%s' dstSample='%s'\n",          printf("srcSample='%s' dstSample='%s'\n",
453                 (!srcDimRgn->pSample ? "NULL" : srcDimRgn->pSample->pInfo->Name.c_str()),                 (!srcDimRgn->pSample ? "NULL" : srcDimRgn->pSample->pInfo->Name.c_str()),
# Line 459  static void copyDimensionRegions(gig::Re Line 466  static void copyDimensionRegions(gig::Re
466              // re-select target dimension region (with correct velocity zone)              // re-select target dimension region (with correct velocity zone)
467              DimensionZones dstZones = preciseDimensionZonesFor(gig::dimension_velocity, dstDimRgn);              DimensionZones dstZones = preciseDimensionZonesFor(gig::dimension_velocity, dstDimRgn);
468              assert(dstZones.size() > 1);              assert(dstZones.size() > 1);
469              int iZoneIndex = dstDimCase[gig::dimension_velocity];              const int iDstZoneIndex =
470              e.velocityZone = iZoneIndex;                  (mainDim == gig::dimension_velocity)
471                        ? iDstMainBit : dstDimCase[gig::dimension_velocity]; // (mainDim == gig::dimension_velocity) exception case probably unnecessary here
472                e.velocityZone = iDstZoneIndex;
473              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
474              printf("dst velocity zone: %d/%d\n", iZoneIndex, (int)dstZones.size());              printf("dst velocity zone: %d/%d\n", iDstZoneIndex, (int)dstZones.size());
475              #endif              #endif
476              assert(uint(iZoneIndex) < dstZones.size());              assert(uint(iDstZoneIndex) < dstZones.size());
477              dstDimCase[gig::dimension_velocity] = dstZones[iZoneIndex].low; // arbitrary value between low and high              dstDimCase[gig::dimension_velocity] = dstZones[iDstZoneIndex].low; // arbitrary value between low and high
478              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
479              printf("dst velocity value = %d\n", dstDimCase[gig::dimension_velocity]);              printf("dst velocity value = %d\n", dstDimCase[gig::dimension_velocity]);
480              printf("dst refilled "); fflush(stdout);              printf("dst refilled "); fflush(stdout);
481              #endif              #endif
482              fillDimValues(dstDimValues, dstDimCase, outRgn, true);              fillDimValues(dstDimValues, dstDimCase, outRgn, false);
483              dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);              dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
484              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
485              printf("reselected dstDimRgn=%lx\n", (uint64_t)dstDimRgn);              printf("reselected dstDimRgn=%lx\n", (uint64_t)dstDimRgn);
486              printf("dstSample='%s'\n",              printf("dstSample='%s'%s\n",
487                  (!dstDimRgn->pSample ? "NULL" : dstDimRgn->pSample->pInfo->Name.c_str())                  (!dstDimRgn->pSample ? "NULL" : dstDimRgn->pSample->pInfo->Name.c_str()),
488                    (dstDimRgn->pSample ? " <--- ERROR ERROR ERROR !!!!!!!!! " : "")
489              );              );
490              #endif              #endif
491    
# Line 484  static void copyDimensionRegions(gig::Re Line 494  static void copyDimensionRegions(gig::Re
494              if (inRgn->GetDimensionDefinition(gig::dimension_velocity)) {              if (inRgn->GetDimensionDefinition(gig::dimension_velocity)) {
495                  DimensionZones srcZones = preciseDimensionZonesFor(gig::dimension_velocity, srcDimRgn);                  DimensionZones srcZones = preciseDimensionZonesFor(gig::dimension_velocity, srcDimRgn);
496                  e.totalSrcVelocityZones = srcZones.size();                  e.totalSrcVelocityZones = srcZones.size();
497                  assert(srcZones.size() > 1);                  assert(srcZones.size() > 0);
498                  if (uint(iZoneIndex) >= srcZones.size())                  if (srcZones.size() <= 1) {
499                      iZoneIndex  = srcZones.size() - 1;                      addWarning("Input region has a velocity dimension with only ONE zone!");
500                  srcDimCase[gig::dimension_velocity] = srcZones[iZoneIndex].low; // same zone as used above for target dimension region (no matter what the precise zone ranges are)                  }
501                    int iSrcZoneIndex =
502                        (mainDim == gig::dimension_velocity)
503                            ? iSrcMainBit : iDstZoneIndex;
504                    if (uint(iSrcZoneIndex) >= srcZones.size())
505                        iSrcZoneIndex = srcZones.size() - 1;
506                    srcDimCase[gig::dimension_velocity] = srcZones[iSrcZoneIndex].low; // same zone as used above for target dimension region (no matter what the precise zone ranges are)
507                  #if DEBUG_COMBINE_INSTRUMENTS                  #if DEBUG_COMBINE_INSTRUMENTS
508                  printf("src refilled "); fflush(stdout);                  printf("src refilled "); fflush(stdout);
509                  #endif                  #endif
# Line 502  static void copyDimensionRegions(gig::Re Line 518  static void copyDimensionRegions(gig::Re
518              }              }
519          }          }
520    
521          // Schedule copy opertion of source -> target DimensionRegion for the          // Schedule copy operation of source -> target DimensionRegion for the
522          // time after all nested loops have been traversed. We have to postpone          // time after all nested loops have been traversed. We have to postpone
523          // the actual copy operations this way, because otherwise it would          // the actual copy operations this way, because otherwise it would
524          // overwrite informations inside the destination DimensionRegion object          // overwrite informations inside the destination DimensionRegion object
# Line 533  static void copyDimensionRegions(gig::Re Line 549  static void copyDimensionRegions(gig::Re
549          dimCase[type] = (def->split_type == gig::split_type_bit) ? iZone : zoneRange.low;          dimCase[type] = (def->split_type == gig::split_type_bit) ? iZone : zoneRange.low;
550    
551          // recurse until 'dims' is exhausted (and dimCase filled up with concrete value)          // recurse until 'dims' is exhausted (and dimCase filled up with concrete value)
552          copyDimensionRegions(outRgn, inRgn, dims, iDstLayer, iSrcLayer, dimCase, schedule);          scheduleCopyDimensionRegions(outRgn, inRgn, dims, mainDim, iDstMainBit, iSrcMainBit, schedule, dimCase);
553      }      }
554    }
555    
556      // if current function call is the (very first) entry point ...  static OrderedRegionGroup sortRegionGroup(const RegionGroup& group, const std::vector<gig::Instrument*>& instruments) {
557      if (isHighestLevelOfRecursion) {      OrderedRegionGroup result;
558          // ... then perform all scheduled DimensionRegion copy operations      for (std::vector<gig::Instrument*>::const_iterator it = instruments.begin();
559          for (uint i = 0; i < schedule->size(); ++i) {           it != instruments.end(); ++it)
560              CopyAssignSchedEntry& e = (*schedule)[i];      {
561            RegionGroup::const_iterator itRgn = group.find(*it);
562              // backup the target DimensionRegion's current dimension zones upper          if (itRgn == group.end()) continue;
563              // limits (because the target DimensionRegion's upper limits are          result.push_back(
564              // already defined correctly since calling AddDimension(), and the              std::pair<gig::Instrument*, gig::Region*>(
565              // CopyAssign() call next, will overwrite those upper limits                  itRgn->first, itRgn->second
566              // unfortunately              )
567              DimensionRegionUpperLimits dstUpperLimits = getDimensionRegionUpperLimits(e.dst);          );
             DimensionRegionUpperLimits srcUpperLimits = getDimensionRegionUpperLimits(e.src);  
   
             // now actually copy over the current DimensionRegion  
             const gig::Region* const origRgn = e.dst->GetParent(); // just for sanity check below  
             e.dst->CopyAssign(e.src);  
             assert(origRgn == e.dst->GetParent()); // if gigedit is crashing here, then you must update libgig (to at least SVN r2547, v3.3.0.svn10)  
   
             // restore all original dimension zone upper limits except of the  
             // velocity dimension, because the velocity dimension zone sizes are  
             // allowed to differ for individual DimensionRegions in gig v3  
             // format  
             if (srcUpperLimits.count(gig::dimension_velocity)) {  
                 assert(dstUpperLimits.count(gig::dimension_velocity));  
                 dstUpperLimits[gig::dimension_velocity] =  
                     (e.velocityZone >= e.totalSrcVelocityZones)  
                         ? 127 : srcUpperLimits[gig::dimension_velocity];  
             }  
             restoreDimensionRegionUpperLimits(e.dst, dstUpperLimits);  
         }  
         delete schedule;  
568      }      }
569        return result;
570  }  }
571    
572  /** @brief Combine given list of instruments to one instrument.  /** @brief Combine given list of instruments to one instrument.
573   *   *
574   * Takes a list of @a instruments as argument and combines them to one single   * Takes a list of @a instruments as argument and combines them to one single
575   * new @a output instrument. For this task, it will create a 'layer' dimension   * new @a output instrument. For this task, it will create a dimension of type
576   * in the new instrument and copies the source instruments to those layers.   * given by @a mainDimension in the new instrument and copies the source
577     * instruments to those dimension zones.
578   *   *
579   * @param instruments - (input) list of instruments that shall be combined,   * @param instruments - (input) list of instruments that shall be combined,
580   *                      they will only be read, so they will be left untouched   *                      they will only be read, so they will be left untouched
# Line 583  static void copyDimensionRegions(gig::Re Line 582  static void copyDimensionRegions(gig::Re
582   *              be created   *              be created
583   * @param output - (output) on success this pointer will be set to the new   * @param output - (output) on success this pointer will be set to the new
584   *                 instrument being created   *                 instrument being created
585     * @param mainDimension - the dimension that shall be used to combine the
586     *                        instruments
587   * @throw RIFF::Exception on any kinds of errors   * @throw RIFF::Exception on any kinds of errors
588   */   */
589  static void combineInstruments(std::vector<gig::Instrument*>& instruments, gig::File* gig, gig::Instrument*& output) {  static void combineInstruments(std::vector<gig::Instrument*>& instruments, gig::File* gig, gig::Instrument*& output, gig::dimension_t mainDimension) {
590      output = NULL;      output = NULL;
591    
592      // divide the individual regions to (probably even smaller) groups of      // divide the individual regions to (probably even smaller) groups of
# Line 618  static void combineInstruments(std::vect Line 619  static void combineInstruments(std::vect
619      {      {
620          gig::Region* outRgn = outInstr->AddRegion();          gig::Region* outRgn = outInstr->AddRegion();
621          outRgn->SetKeyRange(itGroup->first.low, itGroup->first.high);          outRgn->SetKeyRange(itGroup->first.low, itGroup->first.high);
622            #if DEBUG_COMBINE_INSTRUMENTS
623            printf("---> Start target region %d..%d\n", itGroup->first.low, itGroup->first.high);
624            #endif
625    
626          // detect the total amount of layers required to build up this combi          // detect the total amount of zones required for the given main
627          // for current key range          // dimension to build up this combi for current key range
628          int iTotalLayers = 0;          int iTotalZones = 0;
629          for (RegionGroup::iterator itRgn = itGroup->second.begin();          for (RegionGroup::iterator itRgn = itGroup->second.begin();
630               itRgn != itGroup->second.end(); ++itRgn)               itRgn != itGroup->second.end(); ++itRgn)
631          {          {
632              gig::Region* inRgn = itRgn->second;              gig::Region* inRgn = itRgn->second;
633              iTotalLayers += inRgn->Layers;              gig::dimension_def_t* def = inRgn->GetDimensionDefinition(mainDimension);
634                iTotalZones += (def) ? def->zones : 1;
635          }          }
636            #if DEBUG_COMBINE_INSTRUMENTS
637            printf("Required total zones: %d, vertical regions: %d\n", iTotalZones, itGroup->second.size());
638            #endif
639    
640          // create all required dimensions for this output region          // create all required dimensions for this output region
641          // (except the layer dimension, which we create as next step)          // (except the main dimension used for separating the individual
642            // instruments, we create that particular dimension as next step)
643          Dimensions dims = getDimensionsForRegionGroup(itGroup->second);          Dimensions dims = getDimensionsForRegionGroup(itGroup->second);
644          for (Dimensions::iterator itDim = dims.begin();          // the given main dimension which is used to combine the instruments is
645               itDim != dims.end(); ++itDim)          // created separately after the next code block, and the main dimension
646            // should not be part of dims here, because it also used for iterating
647            // all dimensions zones, which would lead to this dimensions being
648            // iterated twice
649            dims.erase(mainDimension);
650          {          {
651              if (itDim->first == gig::dimension_layer) continue;              std::vector<gig::dimension_t> skipTheseDimensions; // used to prevent a misbehavior (i.e. crash) of the combine algorithm in case one of the source instruments has a dimension with only one zone, which is not standard conform
652    
653              gig::dimension_def_t def;              for (Dimensions::iterator itDim = dims.begin();
654              def.dimension = itDim->first; // dimension type                  itDim != dims.end(); ++itDim)
655              def.zones = itDim->second.size();              {
656              def.bits = zoneCountToBits(def.zones);                  gig::dimension_def_t def;
657              #if DEBUG_COMBINE_INSTRUMENTS                  def.dimension = itDim->first; // dimension type
658              std::cout << "Adding new regular dimension type=" << std::hex << (int)def.dimension << std::dec << ", zones=" << (int)def.zones << ", bits=" << (int)def.bits << " ... " << std::flush;                  def.zones = itDim->second.size();
659              #endif                  def.bits = zoneCountToBits(def.zones);
660              outRgn->AddDimension(&def);                  if (def.zones < 2) {
661              #if DEBUG_COMBINE_INSTRUMENTS                      addWarning(
662              std::cout << "OK" << std::endl << std::flush;                          "Attempt to create dimension with type=0x%x with only "
663              #endif                          "ONE zone (because at least one of the source "
664                            "instruments seems to have such a velocity dimension "
665                            "with only ONE zone, which is odd)! Skipping this "
666                            "dimension for now.",
667                            (int)itDim->first
668                        );
669                        skipTheseDimensions.push_back(itDim->first);
670                        continue;
671                    }
672                    #if DEBUG_COMBINE_INSTRUMENTS
673                    std::cout << "Adding new regular dimension type=" << std::hex << (int)def.dimension << std::dec << ", zones=" << (int)def.zones << ", bits=" << (int)def.bits << " ... " << std::flush;
674                    #endif
675                    outRgn->AddDimension(&def);
676                    #if DEBUG_COMBINE_INSTRUMENTS
677                    std::cout << "OK" << std::endl << std::flush;
678                    #endif
679                }
680                // prevent the following dimensions to be processed further below
681                // (since the respective dimension was not created above)
682                for (int i = 0; i < skipTheseDimensions.size(); ++i)
683                    dims.erase(skipTheseDimensions[i]);
684          }          }
685    
686          // create the layer dimension (if necessary for current key range)          // create the main dimension (if necessary for current key range)
687          if (iTotalLayers > 1) {          if (iTotalZones > 1) {
688              gig::dimension_def_t def;              gig::dimension_def_t def;
689              def.dimension = gig::dimension_layer; // dimension type              def.dimension = mainDimension; // dimension type
690              def.zones = iTotalLayers;              def.zones = iTotalZones;
691              def.bits = zoneCountToBits(def.zones);              def.bits = zoneCountToBits(def.zones);
692              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
693              std::cout << "Adding new (layer) dimension type=" << std::hex << (int)def.dimension << std::dec << ", zones=" << (int)def.zones << ", bits=" << (int)def.bits << " ... " << std::flush;              std::cout << "Adding new main combi dimension type=" << std::hex << (int)def.dimension << std::dec << ", zones=" << (int)def.zones << ", bits=" << (int)def.bits << " ... " << std::flush;
694              #endif              #endif
695              outRgn->AddDimension(&def);              outRgn->AddDimension(&def);
696              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
697              std::cout << "OK" << std::endl << std::flush;              std::cout << "OK" << std::endl << std::flush;
698              #endif              #endif
699            } else {
700                dims.erase(mainDimension);
701          }          }
702    
703          // now copy the source dimension regions to the target dimension regions          // for the next task we need to have the current RegionGroup to be
704          int iDstLayer = 0;          // sorted by instrument in the same sequence as the 'instruments' vector
705          for (RegionGroup::iterator itRgn = itGroup->second.begin();          // argument passed to this function (because the std::map behind the
706               itRgn != itGroup->second.end(); ++itRgn) // iterate over 'vertical' / source regions ...          // 'RegionGroup' type sorts by memory address instead, and that would
707            // sometimes lead to the source instruments' region to be sorted into
708            // the wrong target layer)
709            OrderedRegionGroup currentGroup = sortRegionGroup(itGroup->second, instruments);
710    
711            // schedule copying the source dimension regions to the target dimension
712            // regions
713            CopyAssignSchedule schedule;
714            int iDstMainBit = 0;
715            for (OrderedRegionGroup::iterator itRgn = currentGroup.begin();
716                 itRgn != currentGroup.end(); ++itRgn) // iterate over 'vertical' / source regions ...
717          {          {
718              gig::Region* inRgn = itRgn->second;              gig::Region* inRgn = itRgn->second;
719              for (uint iSrcLayer = 0; iSrcLayer < inRgn->Layers; ++iSrcLayer, ++iDstLayer) {              #if DEBUG_COMBINE_INSTRUMENTS
720                  copyDimensionRegions(outRgn, inRgn, dims, iDstLayer, iSrcLayer);              printf("[source region of '%s']\n", inRgn->GetParent()->pInfo->Name.c_str());
721                #endif
722    
723                // determine how many main dimension zones this input region requires
724                gig::dimension_def_t* def = inRgn->GetDimensionDefinition(mainDimension);
725                const int inRgnMainZones = (def) ? def->zones : 1;
726    
727                for (uint iSrcMainBit = 0; iSrcMainBit < inRgnMainZones; ++iSrcMainBit, ++iDstMainBit) {
728                    scheduleCopyDimensionRegions(
729                        outRgn, inRgn, dims, mainDimension,
730                        iDstMainBit, iSrcMainBit, &schedule
731                    );
732                }
733            }
734    
735            // finally copy the scheduled source -> target dimension regions
736            for (uint i = 0; i < schedule.size(); ++i) {
737                CopyAssignSchedEntry& e = schedule[i];
738    
739                // backup the target DimensionRegion's current dimension zones upper
740                // limits (because the target DimensionRegion's upper limits are
741                // already defined correctly since calling AddDimension(), and the
742                // CopyAssign() call next, will overwrite those upper limits
743                // unfortunately
744                DimensionRegionUpperLimits dstUpperLimits = getDimensionRegionUpperLimits(e.dst);
745                DimensionRegionUpperLimits srcUpperLimits = getDimensionRegionUpperLimits(e.src);
746    
747                // now actually copy over the current DimensionRegion
748                const gig::Region* const origRgn = e.dst->GetParent(); // just for sanity check below
749                e.dst->CopyAssign(e.src);
750                assert(origRgn == e.dst->GetParent()); // if gigedit is crashing here, then you must update libgig (to at least SVN r2547, v3.3.0.svn10)
751    
752                // restore all original dimension zone upper limits except of the
753                // velocity dimension, because the velocity dimension zone sizes are
754                // allowed to differ for individual DimensionRegions in gig v3
755                // format
756                //
757                // if the main dinension is the 'velocity' dimension, then skip
758                // restoring the source's original velocity zone limits, because
759                // dealing with merging that is not implemented yet
760                // TODO: merge custom velocity splits if main dimension is the velocity dimension (for now equal sized velocity zones are used if mainDim is 'velocity')
761                if (srcUpperLimits.count(gig::dimension_velocity) && mainDimension != gig::dimension_velocity) {
762                    if (!dstUpperLimits.count(gig::dimension_velocity)) {
763                        addWarning("Source instrument seems to have a velocity dimension whereas new target instrument doesn't!");
764                    } else {
765                        dstUpperLimits[gig::dimension_velocity] =
766                            (e.velocityZone >= e.totalSrcVelocityZones)
767                                ? 127 : srcUpperLimits[gig::dimension_velocity];
768                    }
769              }              }
770                restoreDimensionRegionUpperLimits(e.dst, dstUpperLimits);
771          }          }
772      }      }
773    
# Line 685  static void combineInstruments(std::vect Line 779  static void combineInstruments(std::vect
779  // class 'CombineInstrumentsDialog'  // class 'CombineInstrumentsDialog'
780    
781  CombineInstrumentsDialog::CombineInstrumentsDialog(Gtk::Window& parent, gig::File* gig)  CombineInstrumentsDialog::CombineInstrumentsDialog(Gtk::Window& parent, gig::File* gig)
782      : Gtk::Dialog(_("Combine Instruments"), parent, true),      : ManagedDialog(_("Combine Instruments"), parent, true),
783        m_gig(gig), m_fileWasChanged(false), m_newCombinedInstrument(NULL),        m_gig(gig), m_fileWasChanged(false), m_newCombinedInstrument(NULL),
784        m_cancelButton(Gtk::Stock::CANCEL), m_OKButton(Gtk::Stock::OK),        m_cancelButton(Gtk::Stock::CANCEL), m_OKButton(Gtk::Stock::OK),
785        m_descriptionLabel()        m_descriptionLabel(), m_tableDimCombo(2, 2), m_comboDimType(),
786          m_labelDimType(Glib::ustring(_("Combine by Dimension:")) + "  ", Gtk::ALIGN_END)
787  {  {
788        if (!Settings::singleton()->autoRestoreWindowDimension) {
789            set_default_size(500, 600);
790            set_position(Gtk::WIN_POS_MOUSE);
791        }
792    
793        m_scrolledWindow.add(m_treeView);
794        m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
795    
796      get_vbox()->pack_start(m_descriptionLabel, Gtk::PACK_SHRINK);      get_vbox()->pack_start(m_descriptionLabel, Gtk::PACK_SHRINK);
797      get_vbox()->pack_start(m_treeView);      get_vbox()->pack_start(m_tableDimCombo, Gtk::PACK_SHRINK);
798        get_vbox()->pack_start(m_scrolledWindow);
799        get_vbox()->pack_start(m_labelOrder, Gtk::PACK_SHRINK);
800        get_vbox()->pack_start(m_iconView, Gtk::PACK_SHRINK);
801      get_vbox()->pack_start(m_buttonBox, Gtk::PACK_SHRINK);      get_vbox()->pack_start(m_buttonBox, Gtk::PACK_SHRINK);
802    
803  #if GTKMM_MAJOR_VERSION >= 3  #if GTKMM_MAJOR_VERSION >= 3
804      description.set_line_wrap();      m_descriptionLabel.set_line_wrap();
805  #endif  #endif
806      m_descriptionLabel.set_text(_(      m_descriptionLabel.set_text(_(
807          "Select at least two instruments below that shall be combined  "          "Select at least two instruments below that shall be combined (as "
808          "as layers (using a \"Layer\" dimension) to a new instrument. The "          "separate dimension zones of the selected dimension type) as a new "
809          "original instruments remain untouched.")          "instrument. The original instruments remain untouched.\n\n"
810      );          "You may use this tool for example to combine solo instruments into "
811            "a combi sound arrangement by selecting the 'layer' dimension, or you "
812            "might combine similar sounding solo sounds into separate velocity "
813            "split layers by using the 'velocity' dimension, and so on."
814        ));
815    
816        // add dimension type combo box
817        {
818            int iLayerDimIndex = -1;
819            Glib::RefPtr<Gtk::ListStore> refComboModel = Gtk::ListStore::create(m_comboDimsModel);
820            for (int i = 0x01, iRow = 0; i < 0xff; i++) {
821                Glib::ustring sType =
822                    dimTypeAsString(static_cast<gig::dimension_t>(i));
823                if (sType.find("Unknown") != 0) {
824                    Gtk::TreeModel::Row row = *(refComboModel->append());
825                    row[m_comboDimsModel.m_type_id]   = i;
826                    row[m_comboDimsModel.m_type_name] = sType;
827                    if (i == gig::dimension_layer) iLayerDimIndex = iRow;
828                    iRow++;
829                }
830            }
831            m_comboDimType.set_model(refComboModel);
832            m_comboDimType.pack_start(m_comboDimsModel.m_type_id);
833            m_comboDimType.pack_start(m_comboDimsModel.m_type_name);
834            m_tableDimCombo.attach(m_labelDimType, 0, 1, 0, 1);
835            m_tableDimCombo.attach(m_comboDimType, 1, 2, 0, 1);
836            m_comboDimType.set_active(iLayerDimIndex); // preselect "layer" dimension
837        }
838    
839      m_refTreeModel = Gtk::ListStore::create(m_columns);      m_refTreeModel = Gtk::ListStore::create(m_columns);
840      m_treeView.set_model(m_refTreeModel);      m_treeView.set_model(m_refTreeModel);
# Line 709  CombineInstrumentsDialog::CombineInstrum Line 842  CombineInstrumentsDialog::CombineInstrum
842          "Use SHIFT + left click or CTRL + left click to select the instruments "          "Use SHIFT + left click or CTRL + left click to select the instruments "
843          "you want to combine."          "you want to combine."
844      ));      ));
845      m_treeView.append_column("Instrument", m_columns.m_col_name);      m_treeView.append_column(_("Nr"), m_columns.m_col_index);
846      m_treeView.set_headers_visible(false);      m_treeView.append_column(_("Instrument"), m_columns.m_col_name);
847        m_treeView.set_headers_visible(true);
848      m_treeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);      m_treeView.get_selection()->set_mode(Gtk::SELECTION_MULTIPLE);
849      m_treeView.get_selection()->signal_changed().connect(      m_treeView.get_selection()->signal_changed().connect(
850          sigc::mem_fun(*this, &CombineInstrumentsDialog::onSelectionChanged)          sigc::mem_fun(*this, &CombineInstrumentsDialog::onSelectionChanged)
# Line 735  CombineInstrumentsDialog::CombineInstrum Line 869  CombineInstrumentsDialog::CombineInstrum
869          Glib::ustring name(gig_to_utf8(instr->pInfo->Name));          Glib::ustring name(gig_to_utf8(instr->pInfo->Name));
870          Gtk::TreeModel::iterator iter = m_refTreeModel->append();          Gtk::TreeModel::iterator iter = m_refTreeModel->append();
871          Gtk::TreeModel::Row row = *iter;          Gtk::TreeModel::Row row = *iter;
872            row[m_columns.m_col_index] = i;
873          row[m_columns.m_col_name] = name;          row[m_columns.m_col_name] = name;
874          row[m_columns.m_col_instr] = instr;          row[m_columns.m_col_instr] = instr;
875      }      }
876    
877        m_refOrderModel = Gtk::ListStore::create(m_orderColumns);
878        m_iconView.set_model(m_refOrderModel);
879        m_iconView.set_tooltip_text(_("Use drag & drop to change the order."));
880        m_iconView.set_markup_column(1);
881        m_iconView.set_selection_mode(Gtk::SELECTION_SINGLE);
882        // force background to retain white also on selections
883        // (this also fixes a bug with GTK 2 which often causes visibility issue
884        //  with the text of the selected item)
885        {
886            Gdk::Color white;
887            white.set("#ffffff");
888            m_iconView.modify_base(Gtk::STATE_SELECTED, white);
889            m_iconView.modify_base(Gtk::STATE_ACTIVE, white);
890            m_iconView.modify_bg(Gtk::STATE_SELECTED, white);
891            m_iconView.modify_bg(Gtk::STATE_ACTIVE, white);
892        }
893    
894        m_labelOrder.set_text(_("Order of the instruments to be combined:"));
895    
896        // establish drag&drop within the instrument tree view, allowing to reorder
897        // the sequence of instruments within the gig file
898        {
899            std::vector<Gtk::TargetEntry> drag_target_instrument;
900            drag_target_instrument.push_back(Gtk::TargetEntry("gig::Instrument"));
901            m_iconView.drag_source_set(drag_target_instrument);
902            m_iconView.drag_dest_set(drag_target_instrument);
903            m_iconView.signal_drag_begin().connect(
904                sigc::mem_fun(*this, &CombineInstrumentsDialog::on_order_drag_begin)
905            );
906            m_iconView.signal_drag_data_get().connect(
907                sigc::mem_fun(*this, &CombineInstrumentsDialog::on_order_drag_data_get)
908            );
909            m_iconView.signal_drag_data_received().connect(
910                sigc::mem_fun(*this, &CombineInstrumentsDialog::on_order_drop_drag_data_received)
911            );
912        }
913    
914      m_buttonBox.set_layout(Gtk::BUTTONBOX_END);      m_buttonBox.set_layout(Gtk::BUTTONBOX_END);
915      m_buttonBox.set_border_width(5);      m_buttonBox.set_border_width(5);
916      m_buttonBox.pack_start(m_cancelButton, Gtk::PACK_SHRINK);      m_buttonBox.pack_start(m_cancelButton, Gtk::PACK_SHRINK);
# Line 772  CombineInstrumentsDialog::CombineInstrum Line 944  CombineInstrumentsDialog::CombineInstrum
944      }      }
945  }  }
946    
947    void CombineInstrumentsDialog::on_order_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
948    {
949        printf("Drag begin\n");
950        first_call_to_drag_data_get = true;
951    }
952    
953    void CombineInstrumentsDialog::on_order_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context,
954                                                           Gtk::SelectionData& selection_data, guint, guint)
955    {
956        printf("Drag data get\n");
957        if (!first_call_to_drag_data_get) return;
958        first_call_to_drag_data_get = false;
959    
960        // get selected source instrument
961        gig::Instrument* src = NULL;
962        {
963            std::vector<Gtk::TreeModel::Path> rows = m_iconView.get_selected_items();
964            if (!rows.empty()) {
965                Gtk::TreeModel::iterator it = m_refOrderModel->get_iter(rows[0]);
966                if (it) {
967                    Gtk::TreeModel::Row row = *it;
968                    src = row[m_orderColumns.m_col_instr];
969                }
970            }
971        }
972        if (!src) {
973            printf("Drag data get: !src\n");
974            return;
975        }
976        printf("src=%ld\n", (size_t)src);
977    
978        // pass the source gig::Instrument as pointer
979        selection_data.set(selection_data.get_target(), 0/*unused*/, (const guchar*)&src,
980                           sizeof(src)/*length of data in bytes*/);
981    }
982    
983    void CombineInstrumentsDialog::on_order_drop_drag_data_received(
984        const Glib::RefPtr<Gdk::DragContext>& context, int x, int y,
985        const Gtk::SelectionData& selection_data, guint, guint time)
986    {
987        printf("Drag data received\n");
988        if (&selection_data == NULL) {
989            printf("!selection_data\n");
990            return;
991        }
992        if (!selection_data.get_data()) {
993            printf("selection_data.get_data() == NULL\n");
994            return;
995        }
996    
997        gig::Instrument* src = *((gig::Instrument**) selection_data.get_data());
998        if (!src || selection_data.get_length() != sizeof(gig::Instrument*)) {
999            printf("!src\n");
1000            return;
1001        }
1002        printf("src=%d\n", src);
1003    
1004        gig::Instrument* dst = NULL;
1005        {
1006            Gtk::TreeModel::Path path = m_iconView.get_path_at_pos(x, y);
1007            if (!path) return;
1008    
1009            Gtk::TreeModel::iterator iter = m_refOrderModel->get_iter(path);
1010            if (!iter) return;
1011            Gtk::TreeModel::Row row = *iter;
1012            dst = row[m_orderColumns.m_col_instr];
1013        }
1014        if (!dst) {
1015            printf("!dst\n");
1016            return;
1017        }
1018    
1019        printf("dragdrop received src='%s' dst='%s'\n", src->pInfo->Name.c_str(), dst->pInfo->Name.c_str());
1020    
1021        // swap the two items
1022        typedef Gtk::TreeModel::Children Children;
1023        Children children = m_refOrderModel->children();
1024        Children::iterator itSrc, itDst;
1025        int i = 0, iSrc = -1, iDst = -1;
1026        for (Children::iterator iter = children.begin();
1027             iter != children.end(); ++iter, ++i)
1028        {
1029            Gtk::TreeModel::Row row = *iter;
1030            if (row[m_orderColumns.m_col_instr] == src) {
1031                itSrc = iter;
1032                iSrc  = i;
1033            } else if (row[m_orderColumns.m_col_instr] == dst) {
1034                itDst = iter;
1035                iDst  = i;
1036            }
1037        }
1038        if (itSrc && itDst) {
1039            // swap elements
1040            m_refOrderModel->iter_swap(itSrc, itDst);
1041            // update markup
1042            Gtk::TreeModel::Row rowSrc = *itSrc;
1043            Gtk::TreeModel::Row rowDst = *itDst;
1044            {
1045                Glib::ustring name = rowSrc[m_orderColumns.m_col_name];
1046                Glib::ustring markup =
1047                    "<span foreground='black' background='white'>" + ToString(iDst+1) + ".</span>\n<span foreground='green' background='white'>" + name + "</span>";
1048                rowSrc[m_orderColumns.m_col_markup] = markup;
1049            }
1050            {
1051                Glib::ustring name = rowDst[m_orderColumns.m_col_name];
1052                Glib::ustring markup =
1053                    "<span foreground='black' background='white'>" + ToString(iSrc+1) + ".</span>\n<span foreground='green' background='white'>" + name + "</span>";
1054                rowDst[m_orderColumns.m_col_markup] = markup;
1055            }
1056        }
1057    }
1058    
1059    void CombineInstrumentsDialog::setSelectedInstruments(const std::set<int>& instrumentIndeces) {
1060        typedef Gtk::TreeModel::Children Children;
1061        Children children = m_refTreeModel->children();
1062        for (Children::iterator iter = children.begin();
1063             iter != children.end(); ++iter)
1064        {
1065            Gtk::TreeModel::Row row = *iter;
1066            int index = row[m_columns.m_col_index];
1067            if (instrumentIndeces.count(index))
1068                m_treeView.get_selection()->select(iter);
1069        }
1070    }
1071    
1072  void CombineInstrumentsDialog::combineSelectedInstruments() {  void CombineInstrumentsDialog::combineSelectedInstruments() {
1073      std::vector<gig::Instrument*> instruments;      std::vector<gig::Instrument*> instruments;
1074      std::vector<Gtk::TreeModel::Path> v = m_treeView.get_selection()->get_selected_rows();      {
1075      for (uint i = 0; i < v.size(); ++i) {          typedef Gtk::TreeModel::Children Children;
1076          Gtk::TreeModel::iterator it = m_refTreeModel->get_iter(v[i]);          int i = 0;
1077          Gtk::TreeModel::Row row = *it;          Children selection = m_refOrderModel->children();
1078          Glib::ustring name = row[m_columns.m_col_name];          for (Children::iterator it = selection.begin();
1079          gig::Instrument* instrument = row[m_columns.m_col_instr];               it != selection.end(); ++it, ++i)
1080          #if DEBUG_COMBINE_INSTRUMENTS          {
1081          printf("Selection '%s' 0x%lx\n\n", name.c_str(), int64_t((void*)instrument));              Gtk::TreeModel::Row row = *it;
1082          #endif              Glib::ustring name = row[m_orderColumns.m_col_name];
1083          instruments.push_back(instrument);              gig::Instrument* instrument = row[m_orderColumns.m_col_instr];
1084                #if DEBUG_COMBINE_INSTRUMENTS
1085                printf("Selection %d. '%s' %p\n\n", (i+1), name.c_str(), instrument));
1086                #endif
1087                instruments.push_back(instrument);
1088            }
1089      }      }
1090    
1091        g_warnings.clear();
1092    
1093      try {      try {
1094          combineInstruments(instruments, m_gig, m_newCombinedInstrument);          // which main dimension was selected in the combo box?
1095            gig::dimension_t mainDimension;
1096            {
1097                Gtk::TreeModel::iterator iterType = m_comboDimType.get_active();
1098                if (!iterType) throw gig::Exception("No dimension selected");
1099                Gtk::TreeModel::Row rowType = *iterType;
1100                if (!rowType) throw gig::Exception("Something is wrong regarding dimension selection");
1101                int iTypeID = rowType[m_comboDimsModel.m_type_id];
1102                mainDimension = static_cast<gig::dimension_t>(iTypeID);
1103            }
1104    
1105            // now start the actual combination task ...
1106            combineInstruments(instruments, m_gig, m_newCombinedInstrument, mainDimension);
1107      } catch (RIFF::Exception e) {;      } catch (RIFF::Exception e) {;
1108          Gtk::MessageDialog msg(*this, e.Message, false, Gtk::MESSAGE_ERROR);          Gtk::MessageDialog msg(*this, e.Message, false, Gtk::MESSAGE_ERROR);
1109          msg.run();          msg.run();
1110          return;          return;
1111        } catch (...) {
1112            Glib::ustring txt = _("An unknown exception occurred!");
1113            Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_ERROR);
1114            msg.run();
1115            return;
1116        }
1117    
1118        if (!g_warnings.empty()) {
1119            Glib::ustring txt = _(
1120                "Combined instrument was created successfully, but there were warnings:"
1121            );
1122            txt += "\n\n";
1123            for (Warnings::const_iterator itWarn = g_warnings.begin();
1124                 itWarn != g_warnings.end(); ++itWarn)
1125            {
1126                txt += "-> " + *itWarn + "\n";
1127            }
1128            txt += "\n";
1129            txt += _(
1130                "You might also want to check the console for further warnings and "
1131                "error messages."
1132            );
1133            Gtk::MessageDialog msg(*this, txt, false, Gtk::MESSAGE_WARNING);
1134            msg.run();
1135      }      }
1136    
1137      // no error occurred      // no error occurred
# Line 802  void CombineInstrumentsDialog::combineSe Line 1142  void CombineInstrumentsDialog::combineSe
1142  void CombineInstrumentsDialog::onSelectionChanged() {  void CombineInstrumentsDialog::onSelectionChanged() {
1143      std::vector<Gtk::TreeModel::Path> v = m_treeView.get_selection()->get_selected_rows();      std::vector<Gtk::TreeModel::Path> v = m_treeView.get_selection()->get_selected_rows();
1144      m_OKButton.set_sensitive(v.size() >= 2);      m_OKButton.set_sensitive(v.size() >= 2);
1145    
1146        typedef Gtk::TreeModel::Children Children;
1147    
1148        // update horizontal selection list (icon view) ...
1149    
1150        // remove items which are not part of the new selection anymore
1151        {
1152            Children allOrdered = m_refOrderModel->children();
1153            for (Children::iterator itOrder = allOrdered.begin();
1154                 itOrder != allOrdered.end(); ++itOrder)
1155            {
1156                Gtk::TreeModel::Row rowOrder = *itOrder;
1157                gig::Instrument* instr = rowOrder[m_orderColumns.m_col_instr];
1158                for (uint i = 0; i < v.size(); ++i) {
1159                    Gtk::TreeModel::iterator itSel = m_refTreeModel->get_iter(v[i]);
1160                    Gtk::TreeModel::Row rowSel = *itSel;
1161                    if (rowSel[m_columns.m_col_instr] == instr)
1162                        goto nextOrderedItem;
1163                }
1164                goto removeOrderedItem;
1165            nextOrderedItem:
1166                continue;
1167            removeOrderedItem:
1168                m_refOrderModel->erase(itOrder);
1169            }
1170        }
1171    
1172        // add items newly added to the selection
1173        for (uint i = 0; i < v.size(); ++i) {
1174            Gtk::TreeModel::iterator itSel = m_refTreeModel->get_iter(v[i]);
1175            Gtk::TreeModel::Row rowSel = *itSel;
1176            gig::Instrument* instr = rowSel[m_columns.m_col_instr];
1177            Children allOrdered = m_refOrderModel->children();
1178            for (Children::iterator itOrder = allOrdered.begin();
1179                 itOrder != allOrdered.end(); ++itOrder)
1180            {
1181                Gtk::TreeModel::Row rowOrder = *itOrder;
1182                if (rowOrder[m_orderColumns.m_col_instr] == instr)
1183                    goto nextSelectionItem;
1184            }
1185            goto addNewSelectionItem;
1186        nextSelectionItem:
1187            continue;
1188        addNewSelectionItem:
1189            Glib::ustring name = gig_to_utf8(instr->pInfo->Name);
1190            Gtk::TreeModel::iterator iterOrder = m_refOrderModel->append();
1191            Gtk::TreeModel::Row rowOrder = *iterOrder;
1192            rowOrder[m_orderColumns.m_col_name] = name;
1193            rowOrder[m_orderColumns.m_col_instr] = instr;
1194        }
1195    
1196        // update markup
1197        {
1198            int i = 0;
1199            Children allOrdered = m_refOrderModel->children();
1200            for (Children::iterator itOrder = allOrdered.begin();
1201                 itOrder != allOrdered.end(); ++itOrder, ++i)
1202            {
1203                Gtk::TreeModel::Row rowOrder = *itOrder;
1204                Glib::ustring name = rowOrder[m_orderColumns.m_col_name];
1205                Glib::ustring markup =
1206                    "<span foreground='black' background='white'>" + ToString(i+1) + ".</span>\n<span foreground='green' background='white'>" + name + "</span>";
1207                rowOrder[m_orderColumns.m_col_markup] = markup;
1208            }
1209        }
1210  }  }
1211    
1212  bool CombineInstrumentsDialog::fileWasChanged() const {  bool CombineInstrumentsDialog::fileWasChanged() const {
Legend:
Removed from v.2550  
changed lines
  Added in v.3300
  ViewVC Help
Powered by ViewVC