Skip to content

Commit 6fa7d9c

Browse files
committed
Added the ability to import/export DataView data list selected items in CSV format
1 parent 8711a50 commit 6fa7d9c

30 files changed

+500
-120
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
22

3-
project(ModbusTools VERSION 0.3.3 LANGUAGES CXX)
3+
project(ModbusTools VERSION 0.3.4 LANGUAGES CXX)
44

55
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
66
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

bugfix.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ typedef QAtomicInt RefCount_t;
4646
# 0.3.3
4747

4848
* Fixed incorrect data offset for 'WriteSingleRegister'-function in 'SendMessage'-window
49+
50+
# 0.3.4
51+
52+
* Fixed a bug for the DataView item if the specified byte order `MostSignifiedFirst` data was displayed/written incorrectly

changelog.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,10 @@
6363
# 0.3.3
6464

6565
* Improve client's Scanner Window
66-
* Allow user right to enter port name if it's absent in list of ports in ComboBox
66+
* Allow user right to enter port name if it's absent in list of serial ports in ComboBox
67+
* Fixed bugs
68+
69+
# 0.3.4
70+
71+
* Added the ability to import/export DataView data list selected items in CSV format
6772
* Fixed bugs

doc/input/client/client.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ There is copy/paste mechanism available in DataView item(s).
141141

142142
There is an import/export mechanism is also available in DataView.
143143
It can be import/export of selected item(s) in the list
144-
(`Data->Import Items...`/`Data->Export Items...`) and
145-
import/export of whole list (`Data->Import DataView...`/`Data->Export DataView...`).
146-
For such import/export `xml`-format is used.
144+
(`Data->Import Items...`/`Data->Export Items...`, `xml` or `csv` can be choosen) and
145+
import/export of whole list (`Data->Import DataView...`/`Data->Export DataView...`,
146+
for such import/export `xml` is used).
147147

148148
DataView item parameters can also be edited individually directly in the DataView list.
149149

doc/input/server/server.md

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
\page sec_server Server
22

3-
# About Modbus Server
3+
# About Modbus Server {#sec_server_about}
44
The server implements Modbus server device and works like Modbus simulator.
55
However, the server can not only simulate single device, but can simulate several devices that can be connected to
66
a single network, which is especially useful when working with RTU and ASCII protocols, when access to all Modbus servers
@@ -14,14 +14,14 @@ Port contains network settings for both TCP/IP and serial ports. Device contains
1414
The DataViewItem contains a single data unit to be read/write from the device and has many formats to represent
1515
the current data. Action provides simulation capabilities (automatic change of device memory values).
1616

17-
# Quickstart
17+
# Quickstart {#sec_server_quickstart}
1818

1919
![](server_view.png)
2020

2121
To start working with the program, you need to run `server.exe`. Then, by default, when you first start the program,
2222
an empty project is created, consisting of a single port, a device attached to it.
2323

24-
## Port
24+
## Port {#sec_server_quickstart_port}
2525

2626
To change the port settings, you should double-click on the port name in the project tree
2727
or use the menu `Port->Edit Port...`).
@@ -31,7 +31,7 @@ The port must be selected in the project tree. To add a new port, select `Port-
3131

3232
In this dialog box, you can set the network settings for the port.
3333

34-
## Device
34+
## Device {#sec_server_quickstart_device}
3535

3636
To change the device settings you need to double click left mouse button on the device name in the project tree
3737
(or use the menu `Device->Edit Device...`). The device must be selected in the project tree.
@@ -46,7 +46,7 @@ To add existing device to selected port click `Port->Add Existing...`
4646

4747
In this dialog box, you can set the device settings, such as device name and different memory blocks size.
4848

49-
## DataView
49+
## DataView {#sec_server_quickstart_dataview}
5050

5151
To add new DataView List click `Data->New Data View...`. In this window you can set name and refresh period.
5252

@@ -61,15 +61,15 @@ such as the device to which the data relates, address, format, and number of suc
6161
The addresses of the following elements will be automatically calculated as you add them.
6262
Data parameters can be edited individually directly in the DataView list.
6363

64-
## Runtime
64+
## Runtime {#sec_server_quickstart_runtime}
6565

6666
To start the process of accepting remote Modbus requests, click `Run` on the tool bar (or the menu `Runtime->Run`).
6767
After starting the system, project adding/removing ports and devices is not available.
6868
DataView lists and items can be add and delete at runtime. Device parameters can be edited at runtime.
6969

7070
After you have finished working with the project, you can save it using `File->Save` or `File->Save As...`.
7171

72-
# Graphical User Interface
72+
# Graphical User Interface {#sec_server_gui}
7373

7474
![](server_gui_schema.png)
7575

@@ -83,7 +83,7 @@ The graphical interface consists of the following main elements:
8383
* `Tool bar` - access to the most frequently used commands
8484
* `Status bar` - the current status of the program
8585

86-
## Project window
86+
## Project window {#sec_server_gui_project}
8787

8888
![](server_project_window.png)
8989

@@ -129,7 +129,7 @@ For such import/export `xml`-format is used.
129129

130130
Also current selected port is displayed in status bar with its statistics.
131131

132-
## Device window
132+
## Device window {#sec_server_gui_device}
133133

134134
![](server_device_window.png)
135135

@@ -161,7 +161,7 @@ Such settings as memory size and others can be seen and modified using “Device
161161
To import/export device use menu/context menu `Device->Import Device...` and `Device->Export Device...` respectively.
162162
For such import/export `xml`-format is used.
163163

164-
## DataView(s) windows
164+
## DataView(s) windows {#sec_server_gui_dataview}
165165

166166
![](server_dataview_window.png)
167167

@@ -184,14 +184,15 @@ To delete selected DataView item(s) use menu/context menu `Data->Delete Item` or
184184

185185
There is copy/paste mechanism available in DataView item(s).
186186

187-
There is an import/export mechanism is also available in DataView. It can be import/export of selected item(s) in the list
188-
(`Data->Import Items...`/`Data->Export Items...`) and import/export of whole list
189-
(`Data->Import DataView...`/`Data->Export DataView...`).
190-
For such import/export `xml`-format is used.
187+
There is an import/export mechanism is also available in DataView.
188+
It can be import/export of selected item(s) in the list
189+
(`Data->Import Items...`/`Data->Export Items...`, `xml` or `csv` can be choosen) and
190+
import/export of whole list (`Data->Import DataView...`/`Data->Export DataView...`,
191+
for such import/export `xml` is used).
191192

192193
DataView item parameters can also be edited individually directly in the DataView list.
193194

194-
## Actions window
195+
## Actions window {#sec_server_gui_actions}
195196

196197
![](server_actions_window.png)
197198

@@ -235,18 +236,18 @@ There is an import/export mechanism is also available for actions. It can be imp
235236

236237
Each action parameters can also be edited individually directly in the `Action`-window.
237238

238-
## LogView window
239+
## LogView window {#sec_server_gui_logview}
239240

240241
![](server_logview_window.png)
241242

242243
Window for displaying information about the exchange process, debugging information, contents of Modbus network packets, etc.
243244
The information output can be customized using system settings dialog `Tools->Settings->Log/Timestamp`.
244245
Parameters descibed at `System settings`-dialog section.
245246

246-
## Menu
247+
## Menu {#sec_server_gui_menu}
247248
Main menu provides access to all the features of the program. It consists of:
248249

249-
### File
250+
### File {#sec_server_gui_menu_file}
250251
The `File` menu is intended for working with the project file and includes submenus:
251252
* `New...` - open `Project`-dialog to create new project;
252253
* `Open...` - open project from file that defined with standard open dialog.

doc/output/ModbusClient.chm

-12.6 KB
Binary file not shown.

doc/output/ModbusClient.qch

-8 KB
Binary file not shown.

doc/output/ModbusClient.qhc

0 Bytes
Binary file not shown.

doc/output/ModbusServer.chm

278 Bytes
Binary file not shown.

doc/output/ModbusServer.qch

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)