Skip to content

Commit

Permalink
Removed Check sync, and ram/flash sync from tunable memory view, sinc…
Browse files Browse the repository at this point in the history
…e they were not in use
  • Loading branch information
malcom2073 committed Nov 22, 2013
1 parent 75365e0 commit c644431
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 70 deletions.
45 changes: 1 addition & 44 deletions core/src/emsinfo.ui
Original file line number Diff line number Diff line change
Expand Up @@ -17,57 +17,14 @@
<item>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4" stretch="2,1">
<layout class="QHBoxLayout" name="horizontalLayout_4" stretch="2">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTableWidget" name="tableWidget"/>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Local Ram</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Device Flash</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLineEdit" name="localRamLineEdit"/>
</item>
<item>
<widget class="QLineEdit" name="deviceFlashLineEdit"/>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="QPushButton" name="checkSyncButton">
<property name="text">
<string>Check Sync</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
Expand Down
23 changes: 0 additions & 23 deletions core/src/emsinfoview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ EmsInfoView::EmsInfoView(QWidget *parent) : QWidget(parent)
ui.tableWidget->horizontalHeader()->hide();
ui.tableWidget->verticalHeader()->hide();
connect(ui.locationIdInfoTableWidget,SIGNAL(cellDoubleClicked(int,int)),this,SLOT(locationInfoWidgetDoubleClicked(int,int)));
connect(ui.checkSyncButton,SIGNAL(clicked()),this,SIGNAL(checkSync()));
}
void EmsInfoView::normalViewClicked()
{
Expand Down Expand Up @@ -73,17 +72,6 @@ void EmsInfoView::hexViewClicked()
//displayLocationId(locid,true,1); //0 for normal view, 1 for hex view
}

void EmsInfoView::setLocalRam(bool dirty)
{
if (dirty)
{
ui.localRamLineEdit->setText("Local changes not saved to RAM");
}
else
{
ui.localRamLineEdit->setText("Local changes in device RAM");
}
}
void EmsInfoView::clear()
{
ui.locationIdInfoTableWidget->clearContents();
Expand All @@ -92,17 +80,6 @@ void EmsInfoView::clear()
ui.locationIdInfoTableWidget->setRowCount(0);
}

void EmsInfoView::setDeviceFlash(bool dirty)
{
if (dirty)
{
ui.deviceFlashLineEdit->setText("Local changes not saved to FLASH");
}
else
{
ui.deviceFlashLineEdit->setText("Local changes in FLASH");
}
}

void EmsInfoView::locationInfoWidgetDoubleClicked(int row, int column)
{
Expand Down
3 changes: 0 additions & 3 deletions core/src/emsinfoview.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ class EmsInfoView : public QWidget
public:
explicit EmsInfoView(QWidget *parent = 0);
~EmsInfoView();
void setLocalRam(bool dirty);

void setDeviceFlash(bool dirty);
void clear();
void setInterrogationData(QMap<QString,QString> datamap);
protected:
Expand Down

0 comments on commit c644431

Please sign in to comment.