| [qet] [4129] dxftoqet minor changes |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4129
Author: rdsivd
Date: 2015-08-18 13:16:24 +0200 (Tue, 18 Aug 2015)
Log Message:
-----------
dxftoqet minor changes
Modified Paths:
--------------
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxftoqet_mainwindow.cpp
branches/dxftoqet2/dxftoqet_mainwindow.ui
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2015-08-18 09:39:08 UTC (rev 4128)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2015-08-18 11:16:24 UTC (rev 4129)
@@ -235,7 +235,7 @@
Count_lines=0;
- while (Count_lines<Count_entitie_line)
+ while (Count_lines<=Count_entitie_line)
{
dxb_line.x1=DXF_input_entities_line[Count_lines].DXF_entities_line_code_10;
@@ -303,7 +303,7 @@
Count_lines=0;
- while (Count_lines<Count_entitie_arc)
+ while (Count_lines<=Count_entitie_arc)
{
db_arc.center_x=DXF_input_entities_arc[Count_lines].DXF_entities_arc_code_10;
Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-08-18 09:39:08 UTC (rev 4128)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp 2015-08-18 11:16:24 UTC (rev 4129)
@@ -231,6 +231,7 @@
if (FileType=="csv" or FileType=="CSV")
{
main_sw2=1;
+ main_sw3=0;
log_file.append("file of type CSV \n");
dxf_lf.dxf_csv_split();
@@ -247,6 +248,7 @@
{
main_sw3=1;
+ main_sw2=0;
log_file.append("file of type DXF \n");
}
else
@@ -276,9 +278,10 @@
void DXFtoQET_MainWindow::on_actionSave_as_elmt_triggered()
{
+ //DXF_main_base[0].dxf_openfile=ui->dxf_open_file->text();
if (main_sw3==1)
{
- QFile file(DXF_main_base[0].dxf_dir + "/" + DXF_main_base[0].dxf_openfile + ".elmt");
+ QFile file(DXF_main_base[0].dxf_savepath + "/" + DXF_main_base[0].dxf_openfile + ".elmt");
if (!file.open(QFile::WriteOnly | QFile::Text)) {
QMessageBox::warning(this, tr("Application"),
@@ -956,7 +959,9 @@
log_file.append(log_split);
+ ui->dxf_log->setPlainText(log_file);
+ CSV_Load_QTable();
}
@@ -964,9 +969,9 @@
{
log_file.append("not a CSV file, load other file or try a other option \n");
}
- ui->dxf_log->setPlainText(log_file);
+ //ui->dxf_log->setPlainText(log_file);
- CSV_Load_QTable();
+ //CSV_Load_QTable();
}
void DXFtoQET_MainWindow::CSV_Load_QTable()
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-08-18 09:39:08 UTC (rev 4128)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2015-08-18 11:16:24 UTC (rev 4129)
@@ -2684,12 +2684,12 @@
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
- <x>464</x>
- <y>926</y>
+ <x>466</x>
+ <y>958</y>
</hint>
<hint type="destinationlabel">
- <x>466</x>
- <y>926</y>
+ <x>468</x>
+ <y>958</y>
</hint>
</hints>
</connection>
@@ -2700,12 +2700,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>473</x>
- <y>331</y>
+ <x>602</x>
+ <y>380</y>
</hint>
<hint type="destinationlabel">
- <x>731</x>
- <y>340</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2716,12 +2716,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>521</x>
- <y>372</y>
+ <x>602</x>
+ <y>415</y>
</hint>
<hint type="destinationlabel">
- <x>764</x>
- <y>356</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2732,12 +2732,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>513</x>
- <y>406</y>
+ <x>602</x>
+ <y>450</y>
</hint>
<hint type="destinationlabel">
- <x>699</x>
- <y>359</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2748,12 +2748,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>456</x>
- <y>438</y>
+ <x>602</x>
+ <y>485</y>
</hint>
<hint type="destinationlabel">
- <x>777</x>
- <y>358</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2764,12 +2764,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>444</x>
- <y>478</y>
+ <x>602</x>
+ <y>520</y>
</hint>
<hint type="destinationlabel">
- <x>748</x>
- <y>358</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2780,12 +2780,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>426</x>
- <y>511</y>
+ <x>602</x>
+ <y>555</y>
</hint>
<hint type="destinationlabel">
- <x>702</x>
- <y>346</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2796,12 +2796,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>566</x>
- <y>548</y>
+ <x>602</x>
+ <y>590</y>
</hint>
<hint type="destinationlabel">
- <x>745</x>
- <y>355</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2812,12 +2812,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>563</x>
- <y>584</y>
+ <x>602</x>
+ <y>625</y>
</hint>
<hint type="destinationlabel">
- <x>719</x>
- <y>344</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2828,12 +2828,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>525</x>
- <y>613</y>
+ <x>602</x>
+ <y>660</y>
</hint>
<hint type="destinationlabel">
- <x>722</x>
- <y>360</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2844,12 +2844,12 @@
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
- <x>500</x>
- <y>651</y>
+ <x>602</x>
+ <y>695</y>
</hint>
<hint type="destinationlabel">
- <x>754</x>
- <y>355</y>
+ <x>787</x>
+ <y>394</y>
</hint>
</hints>
</connection>
@@ -2869,5 +2869,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>dxf_open_file</sender>
+ <signal>returnPressed()</signal>
+ <receiver>dxf_open_file</receiver>
+ <slot>update()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>339</x>
+ <y>163</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>584</x>
+ <y>159</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>