449 |
uint dstDimValues[8] = {}; |
uint dstDimValues[8] = {}; |
450 |
DimensionCase srcDimCase = dimCase; |
DimensionCase srcDimCase = dimCase; |
451 |
DimensionCase dstDimCase = dimCase; |
DimensionCase dstDimCase = dimCase; |
452 |
srcDimCase[mainDim] = iSrcMainBit; |
if (dims.count(mainDim)) { |
453 |
dstDimCase[mainDim] = iDstMainBit; |
srcDimCase[mainDim] = iSrcMainBit; |
454 |
|
dstDimCase[mainDim] = iDstMainBit; |
455 |
|
} |
456 |
|
|
457 |
#if DEBUG_COMBINE_INSTRUMENTS |
#if DEBUG_COMBINE_INSTRUMENTS |
458 |
printf("-------------------------------\n"); |
printf("-------------------------------\n"); |
662 |
iTotalZones += (def) ? def->zones : 1; |
iTotalZones += (def) ? def->zones : 1; |
663 |
} |
} |
664 |
#if DEBUG_COMBINE_INSTRUMENTS |
#if DEBUG_COMBINE_INSTRUMENTS |
665 |
printf("Required total zones: %d\n", iTotalZones); |
printf("Required total zones: %d, vertical regions: %d\n", iTotalZones, itGroup->second.size()); |
666 |
#endif |
#endif |
667 |
|
|
668 |
// create all required dimensions for this output region |
// create all required dimensions for this output region |
724 |
#if DEBUG_COMBINE_INSTRUMENTS |
#if DEBUG_COMBINE_INSTRUMENTS |
725 |
std::cout << "OK" << std::endl << std::flush; |
std::cout << "OK" << std::endl << std::flush; |
726 |
#endif |
#endif |
727 |
|
} else { |
728 |
|
dims.erase(mainDimension); |
729 |
} |
} |
730 |
|
|
731 |
// for the next task we need to have the current RegionGroup to be |
// for the next task we need to have the current RegionGroup to be |
813 |
m_descriptionLabel(), m_tableDimCombo(2, 2), m_comboDimType(), |
m_descriptionLabel(), m_tableDimCombo(2, 2), m_comboDimType(), |
814 |
m_labelDimType(Glib::ustring(_("Combine by Dimension:")) + " ", Gtk::ALIGN_END) |
m_labelDimType(Glib::ustring(_("Combine by Dimension:")) + " ", Gtk::ALIGN_END) |
815 |
{ |
{ |
816 |
|
m_scrolledWindow.add(m_treeView); |
817 |
|
m_scrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); |
818 |
|
|
819 |
get_vbox()->pack_start(m_descriptionLabel, Gtk::PACK_SHRINK); |
get_vbox()->pack_start(m_descriptionLabel, Gtk::PACK_SHRINK); |
820 |
get_vbox()->pack_start(m_tableDimCombo, Gtk::PACK_SHRINK); |
get_vbox()->pack_start(m_tableDimCombo, Gtk::PACK_SHRINK); |
821 |
get_vbox()->pack_start(m_treeView); |
get_vbox()->pack_start(m_scrolledWindow); |
822 |
get_vbox()->pack_start(m_buttonBox, Gtk::PACK_SHRINK); |
get_vbox()->pack_start(m_buttonBox, Gtk::PACK_SHRINK); |
823 |
|
|
824 |
#if GTKMM_MAJOR_VERSION >= 3 |
#if GTKMM_MAJOR_VERSION >= 3 |