mirrors/zint-barcode-generator
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2025-06-05 01:04:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

DOTCODE: Fix best_mask -> high_score prime test; manual mask

Browse source
This commit is contained in:
gitlost 2021-01-22 18:07:59 +00:00
parent fb12fe4e79
commit f6bed3acb2
11 changed files with 872 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

352
frontend_qt/grpDotCode.ui
View file

@ -295,6 +295,358 @@
<string>50</string>
</property>
</item>
<item>
<property name="text">
<string>51</string>
</property>
</item>
<item>
<property name="text">
<string>52</string>
</property>
</item>
<item>
<property name="text">
<string>53</string>
</property>
</item>
<item>
<property name="text">
<string>54</string>
</property>
</item>
<item>
<property name="text">
<string>55</string>
</property>
</item>
<item>
<property name="text">
<string>56</string>
</property>
</item>
<item>
<property name="text">
<string>57</string>
</property>
</item>
<item>
<property name="text">
<string>58</string>
</property>
</item>
<item>
<property name="text">
<string>59</string>
</property>
</item>
<item>
<property name="text">
<string>60</string>
</property>
</item>
<item>
<property name="text">
<string>61</string>
</property>
</item>
<item>
<property name="text">
<string>62</string>
</property>
</item>
<item>
<property name="text">
<string>63</string>
</property>
</item>
<item>
<property name="text">
<string>64</string>
</property>
</item>
<item>
<property name="text">
<string>65</string>
</property>
</item>
<item>
<property name="text">
<string>66</string>
</property>
</item>
<item>
<property name="text">
<string>67</string>
</property>
</item>
<item>
<property name="text">
<string>68</string>
</property>
</item>
<item>
<property name="text">
<string>69</string>
</property>
</item>
<item>
<property name="text">
<string>70</string>
</property>
</item>
<item>
<property name="text">
<string>71</string>
</property>
</item>
<item>
<property name="text">
<string>72</string>
</property>
</item>
<item>
<property name="text">
<string>73</string>
</property>
</item>
<item>
<property name="text">
<string>74</string>
</property>
</item>
<item>
<property name="text">
<string>75</string>
</property>
</item>
<item>
<property name="text">
<string>76</string>
</property>
</item>
<item>
<property name="text">
<string>77</string>
</property>
</item>
<item>
<property name="text">
<string>78</string>
</property>
</item>
<item>
<property name="text">
<string>79</string>
</property>
</item>
<item>
<property name="text">
<string>80</string>
</property>
</item>
<item>
<property name="text">
<string>81</string>
</property>
</item>
<item>
<property name="text">
<string>82</string>
</property>
</item>
<item>
<property name="text">
<string>83</string>
</property>
</item>
<item>
<property name="text">
<string>84</string>
</property>
</item>
<item>
<property name="text">
<string>85</string>
</property>
</item>
<item>
<property name="text">
<string>86</string>
</property>
</item>
<item>
<property name="text">
<string>87</string>
</property>
</item>
<item>
<property name="text">
<string>88</string>
</property>
</item>
<item>
<property name="text">
<string>89</string>
</property>
</item>
<item>
<property name="text">
<string>90</string>
</property>
</item>
<item>
<property name="text">
<string>91</string>
</property>
</item>
<item>
<property name="text">
<string>92</string>
</property>
</item>
<item>
<property name="text">
<string>93</string>
</property>
</item>
<item>
<property name="text">
<string>94</string>
</property>
</item>
<item>
<property name="text">
<string>95</string>
</property>
</item>
<item>
<property name="text">
<string>96</string>
</property>
</item>
<item>
<property name="text">
<string>97</string>
</property>
</item>
<item>
<property name="text">
<string>98</string>
</property>
</item>
<item>
<property name="text">
<string>99</string>
</property>
</item>
<item>
<property name="text">
<string>100</string>
</property>
</item>
<item>
<property name="text">
<string>101</string>
</property>
</item>
<item>
<property name="text">
<string>102</string>
</property>
</item>
<item>
<property name="text">
<string>103</string>
</property>
</item>
<item>
<property name="text">
<string>104</string>
</property>
</item>
<item>
<property name="text">
<string>105</string>
</property>
</item>
<item>
<property name="text">
<string>106</string>
</property>
</item>
<item>
<property name="text">
<string>107</string>
</property>
</item>
<item>
<property name="text">
<string>108</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelDotMask">
<property name="text">
<string>&amp;Mask:</string>
</property>
<property name="buddy">
<cstring>cmbDotMask</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="cmbDotMask">
<property name="maxVisibleItems">
<number>8</number>
</property>
<item>
<property name="text">
<string>Automatic</string>
</property>
</item>
<item>
<property name="text">
<string>0</string>
</property>
</item>
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>3</string>
</property>
</item>
<item>
<property name="text">
<string>0'</string>
</property>
</item>
<item>
<property name="text">
<string>1'</string>
</property>
</item>
<item>
<property name="text">
<string>2'</string>
</property>
</item>
<item>
<property name="text">
<string>3'</string>
</property>
</item>
</widget>
</item>
</layout>

7
frontend_qt/mainwindow.cpp
View file

@ -664,6 +664,7 @@ void MainWindow::change_options()
file.close();
tabMain->insertTab(1,m_optionWidget,tr("DotCod&e"));
connect(m_optionWidget->findChild<QObject*>("cmbDotCols"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("cmbDotMask"), SIGNAL(currentIndexChanged( int )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("radDotStand"), SIGNAL(clicked( bool )), SLOT(update_preview()));
connect(m_optionWidget->findChild<QObject*>("radDotGS1"), SIGNAL(clicked( bool )), SLOT(update_preview()));
}
@ -1297,6 +1298,10 @@ void MainWindow::update_preview()
case BARCODE_DOTCODE:
m_bc.bc.setSymbol(BARCODE_DOTCODE);
m_bc.bc.setOption2(m_optionWidget->findChild<QComboBox*>("cmbDotCols")->currentIndex());
item_val = m_optionWidget->findChild<QComboBox*>("cmbDotMask")->currentIndex();
if (item_val) {
m_bc.bc.setOption3((item_val << 8) | m_bc.bc.option3());
}
set_gs1_mode(m_optionWidget->findChild<QRadioButton*>("radDotGS1")->isChecked());
break;
@ -1941,6 +1946,7 @@ void MainWindow::save_sub_settings(QSettings &settings, int symbology) {
case BARCODE_DOTCODE:
settings.setValue("studio/bc/dotcode/cols", get_combobox_index("cmbDotCols"));
settings.setValue("studio/bc/dotcode/mask", get_combobox_index("cmbDotMask"));
settings.setValue("studio/bc/dotcode/encoding_mode", get_button_group_index(QStringList() << "radDotStand" << "radDotGS1"));
break;
@ -2169,6 +2175,7 @@ void MainWindow::load_sub_settings(QSettings &settings, int symbology) {
case BARCODE_DOTCODE:
set_combobox_from_setting(settings, "studio/bc/dotcode/cols", "cmbDotCols");
set_combobox_from_setting(settings, "studio/bc/dotcode/mask", "cmbDotMask");
set_radiobutton_from_setting(settings, "studio/bc/dotcode/encoding_mode", QStringList() << "radDotStand" << "radDotGS1");
break;