From 994568799dfe4f8a966d19b68aafb54af53a733d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 16 Sep 2019 10:51:25 +0200 Subject: [PATCH] Refactorization: TBF.UI namespace, no change of function, ver. 2.18.1314 --- DeviceTest/DeviceTestDlg.cs | 8 +- ResultsBrowser/Forms/PrinterConfigDlg.cs | 2 +- TBF/AttachedTextBoxes.cs | 176 -- TBF/BarGraph.cs | 75 - .../ComponentParametersDlg.Designer.cs | 8 +- .../ComponentParametersDlg.cs | 6 +- .../ComponentParametersDlg.resx | 0 .../DataEntry/Standard6/CycleEndForm.cs | 2 +- TBF/BenchControl/Dummy/Balance/Component.cs | 8 +- .../Dummy/FlowMeter/FlowMeterCfgCtrl.cs | 2 +- TBF/BenchControl/Elde/ControlBoardDev.cs | 2 +- .../Elde/FlowMeter/FlowMeterCfgCtrl.cs | 2 - .../Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs | 2 - .../Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs | 1 - .../Elde/FlowMeterTwins/FlowMeter.cs | 9 +- .../Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs | 1 - .../PressureMeterCfgCtrl.cs | 1 - .../TempMeterInternal/TempMeterCfgCtrl.cs | 1 - .../Network/Camera/CLP1611/MJpegFrame.cs | 2 +- .../SaveDiverterCorrCfgCtrl.cs | 1 - .../SaveFlowmeterCorrCfgCtrl.cs | 1 - TBF/{ => BenchControl}/Telegram.cs | 5 +- .../TestMethods/Endurance/CycleDlg.cs | 61 +- .../Endurance/CycleDlg.designer.cs | 4 +- .../TestMethods/Endurance/CycleStepsCtrl.cs | 11 +- TBF/CustomStyle.cs | 86 - TBF/ErrorHandler.cs | 34 - TBF/{Forms => KeepAsBackup}/AboutDlg.pl.resx | 0 TBF/{Forms => KeepAsBackup}/AboutDlg.ru.resx | 0 TBF/{ => KeepAsBackup}/BenchesDlg.pl.resx | 0 TBF/{ => KeepAsBackup}/BenchesDlg.ru.resx | 0 .../ComponentsManagerDlg.pl.resx | 0 .../ComponentsManagerDlg.ru.resx | 0 TBF/{ => KeepAsBackup}/PathsDlg.pl.resx | 0 TBF/{ => KeepAsBackup}/PathsDlg.ru.resx | 0 TBF/{ => KeepAsBackup}/PreferencesDlg.pl.resx | 0 TBF/{ => KeepAsBackup}/PreferencesDlg.ru.resx | 0 TBF/{ => KeepAsBackup}/ProcedureDlg.pl.resx | 0 TBF/{ => KeepAsBackup}/ProcedureDlg.ru.resx | 0 .../SelectComponentClassDlg.pl.resx | 0 .../SelectComponentClassDlg.ru.resx | 0 TBF/{ => KeepAsBackup}/TransitionsDlg.pl.resx | 0 TBF/{ => KeepAsBackup}/TransitionsDlg.ru.resx | 0 TBF/Program.cs | 16 +- TBF/Properties/AssemblyInfo.cs | 4 +- TBF/Resources/Strings.Designer.cs | 27 + TBF/Resources/Strings.resx | 9 + .../MeasurementTabPageCtrl.Designer.cs | 208 -- TBF/Screens/MeasurementTabPageCtrl.cs | 183 -- TBF/Screens/MeasurementTabPageCtrl.resx | 120 - TBF/TBF.csproj | 1144 ++++--- TBF/TBF_TemporaryKey.pfx | Bin 1684 -> 0 bytes .../ComponentsManagerDlg.Designer.cs | 12 +- .../Bench/Components}/ComponentsManagerDlg.cs | 22 +- .../Components}/ComponentsManagerDlg.resx | 0 .../SelectComponentClassDlg.Designer.cs | 4 +- .../Components}/SelectComponentClassDlg.cs | 4 +- .../Components}/SelectComponentClassDlg.resx | 0 .../Bench/Metrology}/IMetrologyDlgTab.cs | 11 +- .../Bench/Metrology}/MetrologyDlg.Designer.cs | 6 +- TBF/{ => UI/Bench/Metrology}/MetrologyDlg.cs | 4 +- .../Bench/Metrology}/MetrologyDlg.resx | 0 .../MetrologyDlgBalanceTab.Designer.cs | 8 +- .../Metrology}/MetrologyDlgBalanceTab.cs | 12 +- .../Metrology}/MetrologyDlgBalanceTab.resx | 0 .../MetrologyDlgDensityTab.Designer.cs | 4 +- .../Metrology}/MetrologyDlgDensityTab.cs | 4 +- .../Metrology}/MetrologyDlgDensityTab.resx | 0 .../MetrologyDlgDiverterTab.Designer.cs | 6 +- .../Metrology}/MetrologyDlgDiverterTab.cs | 16 +- .../Metrology}/MetrologyDlgDiverterTab.resx | 0 .../MetrologyDlgEvaporationTab.Designer.cs | 6 +- .../Metrology}/MetrologyDlgEvaporationTab.cs | 16 +- .../MetrologyDlgEvaporationTab.resx | 0 .../MetrologyDlgFlowMeterTab.Designer.cs | 8 +- .../Metrology}/MetrologyDlgFlowMeterTab.cs | 12 +- .../Metrology}/MetrologyDlgFlowMeterTab.resx | 0 .../MetrologyDlgLevelMeterTab.Designer.cs | 8 +- .../Metrology}/MetrologyDlgLevelMeterTab.cs | 16 +- .../Metrology}/MetrologyDlgLevelMeterTab.resx | 0 ...DlgPlatinumResistanceTMeterTab.Designer.cs | 4 +- ...MetrologyDlgPlatinumResistanceTMeterTab.cs | 4 +- ...trologyDlgPlatinumResistanceTMeterTab.resx | 0 .../MetrologyDlgPressMeterTab.Designer.cs | 8 +- .../Metrology}/MetrologyDlgPressMeterTab.cs | 12 +- .../Metrology}/MetrologyDlgPressMeterTab.resx | 0 .../MetrologyDlgTempMeterTab.Designer.cs | 8 +- .../Metrology}/MetrologyDlgTempMeterTab.cs | 12 +- .../Metrology}/MetrologyDlgTempMeterTab.resx | 0 .../Bench/Paths}/PathsBenchCtrl.cs | 42 +- TBF/{ => UI/Bench/Paths}/PathsDlg.Designer.cs | 22 +- TBF/{ => UI/Bench/Paths}/PathsDlg.cs | 8 +- TBF/{ => UI/Bench/Paths}/PathsDlg.resx | 0 .../Bench/Paths}/PathsFeedingCtrl.cs | 30 +- .../Bench/Paths}/PathsHeatMetersCtrl.cs | 18 +- .../Bench/Paths}/PathsMetersCtrl.cs | 25 +- .../Bench/Paths}/PathsOutputCtrl.cs | 56 +- .../Bench/Transitions}/TransitionStepsCtrl.cs | 34 +- .../Transitions}/TransitionsDlg.Designer.cs | 6 +- .../Bench/Transitions}/TransitionsDlg.cs | 17 +- .../Bench/Transitions}/TransitionsDlg.resx | 0 .../Transitions}/VirtualBenchStepsCtrl.cs | 22 +- .../Camera}/CameraPictureCtrl.Designer.cs | 4 +- .../Camera}/CameraPictureCtrl.cs | 6 +- .../Camera}/CameraPictureCtrl.resx | 0 .../Camera}/CameraPictureCtrl2.Designer.cs | 4 +- .../Camera}/CameraPictureCtrl2.cs | 6 +- .../Camera}/CameraPictureCtrl2.resx | 0 .../Camera}/CameraPictureCtrl3.Designer.cs | 4 +- .../Camera}/CameraPictureCtrl3.cs | 6 +- .../Camera}/CameraPictureCtrl3.resx | 0 .../Camera}/CameraPictureFullCtrl.Designer.cs | 4 +- .../Camera}/CameraPictureFullCtrl.cs | 6 +- .../Camera}/CameraPictureFullCtrl.resx | 0 .../Camera}/ICameraPicture.cs | 7 +- .../Camera}/PicturesTabPageCtrl.Designer.cs | 4 +- .../Camera}/PicturesTabPageCtrl.cs | 33 +- .../Camera}/PicturesTabPageCtrl.resx | 0 TBF/UI/Constants.cs | 8 + .../Graphs}/GraphsTabPageCtrl.cs | 2 +- .../Graphs}/GraphsTabPageCtrl.designer.cs | 4 +- .../Graphs}/GraphsTabPageCtrl.resx | 0 TBF/{Forms => UI/Help}/AboutDlg.Designer.cs | 4 +- TBF/{Forms => UI/Help}/AboutDlg.cs | 4 +- TBF/{Forms => UI/Help}/AboutDlg.resx | 0 .../Logs}/LogsTabPageCtrl.Designer.cs | 4 +- TBF/{Screens => UI/Logs}/LogsTabPageCtrl.cs | 4 +- TBF/{Screens => UI/Logs}/LogsTabPageCtrl.resx | 0 TBF/{ => UI}/MainWnd.Designer.cs | 247 +- TBF/{ => UI}/MainWnd.cs | 105 +- TBF/{ => UI}/MainWnd.cs.resx | 0 TBF/{ => UI}/MainWnd.de.resx | 0 TBF/{ => UI}/MainWnd.it.resx | 0 TBF/{ => UI}/MainWnd.pl.resx | 0 TBF/{ => UI}/MainWnd.resx | 2690 ++++++++--------- TBF/{ => UI}/MainWnd.ru.resx | 0 TBF/{ => UI}/MainWnd.zh-CN.resx | 0 .../Procedures}/ProcedureDlg.Designer.cs | 28 +- TBF/{ => UI/Procedures}/ProcedureDlg.cs | 81 +- TBF/{ => UI/Procedures}/ProcedureDlg.resx | 0 .../ProcedureParamsCtrl.Designer.cs | 8 +- .../Procedures}/ProcedureParamsCtrl.cs | 17 +- .../Procedures}/ProcedureParamsCtrl.resx | 0 .../Procedures}/ProceduresCtrl.cs | 22 +- .../Procedures}/ProceduresDlg.Designer.cs | 12 +- TBF/{ => UI/Procedures}/ProceduresDlg.cs | 7 +- TBF/{ => UI/Procedures}/ProceduresDlg.resx | 0 .../Procedures}/TestParamsCtrl.Designer.cs | 8 +- .../Procedures}/TestParamsCtrl.cs | 19 +- .../Procedures}/TestParamsCtrl.resx | 0 .../TestWizard/FlowSelection.Designer.cs | 4 +- .../Procedures}/TestWizard/FlowSelection.cs | 4 +- .../Procedures}/TestWizard/FlowSelection.resx | 0 .../HeatMetersSelection.Designer.cs | 2 +- .../TestWizard/HeatMetersSelection.cs | 2 +- .../TestWizard/HeatMetersSelection.resx | 0 .../TestWizard/MethodSelection.Designer.cs | 4 +- .../Procedures}/TestWizard/MethodSelection.cs | 4 +- .../TestWizard/MethodSelection.resx | 0 .../TestWizard/PressureSelection.cs | 4 +- .../TestWizard/PressureSelection.designer.cs | 4 +- .../TestWizard/PressureSelection.resx | 0 .../Procedures}/TestWizard/Roi1.Designer.cs | 4 +- TBF/{ => UI/Procedures}/TestWizard/Roi1.cs | 4 +- TBF/{ => UI/Procedures}/TestWizard/Roi1.resx | 0 .../Procedures}/TestWizard/Roi2.Designer.cs | 4 +- TBF/{ => UI/Procedures}/TestWizard/Roi2.cs | 4 +- TBF/{ => UI/Procedures}/TestWizard/Roi2.resx | 0 .../Procedures}/TestWizard/Roi3.Designer.cs | 4 +- TBF/{ => UI/Procedures}/TestWizard/Roi3.cs | 4 +- TBF/{ => UI/Procedures}/TestWizard/Roi3.resx | 0 TBF/{ => UI/Procedures}/TestWizard/RoiData.cs | 4 +- .../VolumeAndErrorSelection.Designer.cs | 4 +- .../TestWizard/VolumeAndErrorSelection.cs | 4 +- .../TestWizard/VolumeAndErrorSelection.resx | 0 .../Process}/ProcessTabPageCtrl24.Designer.cs | 2 +- .../Process}/ProcessTabPageCtrl24.cs | 17 +- .../Process}/ProcessTabPageCtrl24.resx | 0 .../Process}/ProcessTabPageCtrl48.Designer.cs | 2 +- .../Process}/ProcessTabPageCtrl48.cs | 17 +- .../Process}/ProcessTabPageCtrl48.resx | 0 .../Process}/ProcessTabPageCtrl6.Designer.cs | 2 +- .../Process}/ProcessTabPageCtrl6.cs | 17 +- .../Process}/ProcessTabPageCtrl6.resx | 0 .../Process}/ProcessTabPageExCtrl.Designer.cs | 2 +- .../Process}/ProcessTabPageExCtrl.cs | 23 +- .../Process}/ProcessTabPageExCtrl.resx | 0 .../Results}/PreviousResultCtrl.Designer.cs | 2 +- .../Results}/PreviousResultCtrl.cs | 4 +- .../Results}/PreviousResultCtrl.resx | 0 .../Results}/PreviousResultIdEventArgs.cs | 2 +- .../Results}/PreviousResultsDlg.Designer.cs | 2 +- .../Results}/PreviousResultsDlg.cs | 25 +- .../Results}/PreviousResultsDlg.resx | 0 .../ResultsArrangementDlg.Designer.cs | 8 +- .../Results}/ResultsArrangementDlg.cs | 4 +- .../Results}/ResultsArrangementDlg.resx | 0 .../Results}/ResultsTabPageCtrl.Designer.cs | 4 +- .../Results}/ResultsTabPageCtrl.cs | 83 +- .../Results}/ResultsTabPageCtrl.resx | 0 TBF/{ => UI/Settings}/BenchesDlg.Designer.cs | 4 +- TBF/{ => UI/Settings}/BenchesDlg.cs | 18 +- TBF/{ => UI/Settings}/BenchesDlg.resx | 0 .../Settings}/DatabaseSettingsDlg.Designer.cs | 4 +- .../Settings}/DatabaseSettingsDlg.cs | 20 +- .../Settings}/DatabaseSettingsDlg.resx | 0 .../Settings/LanguageDlg.cs} | 8 +- .../Settings/LanguageDlg.designer.cs} | 8 +- .../Settings/LanguageDlg.resx} | 0 .../Settings}/UpgradeSelectionDlg.Designer.cs | 2 +- .../Settings}/UpgradeSelectionDlg.cs | 22 +- .../Settings}/UpgradeSelectionDlg.resx | 0 .../Shared}/BaseWithListViewEx.cs | 7 +- .../Shared}/BenchControlPanel.Designer.cs | 4 +- .../Shared}/BenchControlPanel.cs | 4 +- .../Shared}/BenchControlPanel.cs.resx | 0 .../Shared}/BenchControlPanel.de.resx | 0 .../Shared}/BenchControlPanel.it.resx | 0 .../Shared}/BenchControlPanel.pl.resx | 0 .../Shared}/BenchControlPanel.resx | 0 .../Shared}/ClosingTbfForm.Designer.cs | 2 +- TBF/{Forms => UI/Shared}/ClosingTbfForm.cs | 2 +- TBF/{Forms => UI/Shared}/ClosingTbfForm.resx | 0 TBF/{Forms => UI/Shared}/EmergencyStopForm.cs | 4 +- .../Shared}/EmergencyStopForm.designer.cs | 4 +- .../Shared}/EmergencyStopForm.resx | 0 TBF/{Forms => UI/Shared}/ErrorDlg.Designer.cs | 4 +- TBF/{Forms => UI/Shared}/ErrorDlg.cs | 5 +- TBF/{Forms => UI/Shared}/ErrorDlg.resx | 0 .../Shared}/IParentOfListViewEx.cs | 4 +- .../Shared}/ITabWithListViewEx.cs | 4 +- .../Shared}/LoginDlgWithBenchSelection.cs | 2 +- .../LoginDlgWithBenchSelection.designer.cs | 4 +- .../Shared}/LoginDlgWithBenchSelection.resx | 0 .../Shared}/ModelessActivityForm.cs | 2 +- .../Shared}/ModelessActivityForm.designer.cs | 2 +- .../Shared}/ModelessActivityForm.resx | 0 .../Shared}/NoBenchOrDatabaseDlg.Designer.cs | 4 +- .../Shared}/NoBenchOrDatabaseDlg.cs | 4 +- .../Shared}/NoBenchOrDatabaseDlg.resx | 0 .../Shared}/PrintOrderForm.Designer.cs | 4 +- TBF/{Forms => UI/Shared}/PrintOrderForm.cs | 4 +- TBF/{Forms => UI/Shared}/PrintOrderForm.resx | 0 .../Shared}/RemarkDlg.Designer.cs | 2 +- TBF/{Forms => UI/Shared}/RemarkDlg.cs | 2 +- TBF/{Forms => UI/Shared}/RemarkDlg.resx | 0 .../Shared}/SharedButtons.Designer.cs | 4 +- .../Shared}/SharedButtons.cs | 4 +- .../Shared}/SharedButtons.resx | 0 .../Shared}/TabNameDlg.Designer.cs | 4 +- TBF/{Forms => UI/Shared}/TabNameDlg.cs | 4 +- TBF/{Forms => UI/Shared}/TabNameDlg.resx | 0 .../Shared}/TestProgressCtrl.Designer.cs | 4 +- .../Shared}/TestProgressCtrl.cs | 6 +- .../Shared}/TestProgressCtrl.resx | 0 TBF/{ => UI}/TestProgressControls.cs | 27 +- TBF/UiControls/BenchControlPanel.ru.resx | 186 -- TBF/UiControls/BenchControlPanel.zh-CN.resx | 174 -- 258 files changed, 2791 insertions(+), 4149 deletions(-) delete mode 100644 TBF/AttachedTextBoxes.cs delete mode 100644 TBF/BarGraph.cs rename TBF/{ => BenchControl}/ComponentParametersDlg.Designer.cs (94%) rename TBF/{ => BenchControl}/ComponentParametersDlg.cs (97%) rename TBF/{ => BenchControl}/ComponentParametersDlg.resx (100%) rename TBF/{ => BenchControl}/Telegram.cs (98%) delete mode 100644 TBF/CustomStyle.cs delete mode 100644 TBF/ErrorHandler.cs rename TBF/{Forms => KeepAsBackup}/AboutDlg.pl.resx (100%) rename TBF/{Forms => KeepAsBackup}/AboutDlg.ru.resx (100%) rename TBF/{ => KeepAsBackup}/BenchesDlg.pl.resx (100%) rename TBF/{ => KeepAsBackup}/BenchesDlg.ru.resx (100%) rename TBF/{ => KeepAsBackup}/ComponentsManagerDlg.pl.resx (100%) rename TBF/{ => KeepAsBackup}/ComponentsManagerDlg.ru.resx (100%) rename TBF/{ => KeepAsBackup}/PathsDlg.pl.resx (100%) rename TBF/{ => KeepAsBackup}/PathsDlg.ru.resx (100%) rename TBF/{ => KeepAsBackup}/PreferencesDlg.pl.resx (100%) rename TBF/{ => KeepAsBackup}/PreferencesDlg.ru.resx (100%) rename TBF/{ => KeepAsBackup}/ProcedureDlg.pl.resx (100%) rename TBF/{ => KeepAsBackup}/ProcedureDlg.ru.resx (100%) rename TBF/{ => KeepAsBackup}/SelectComponentClassDlg.pl.resx (100%) rename TBF/{ => KeepAsBackup}/SelectComponentClassDlg.ru.resx (100%) rename TBF/{ => KeepAsBackup}/TransitionsDlg.pl.resx (100%) rename TBF/{ => KeepAsBackup}/TransitionsDlg.ru.resx (100%) delete mode 100644 TBF/Screens/MeasurementTabPageCtrl.Designer.cs delete mode 100644 TBF/Screens/MeasurementTabPageCtrl.cs delete mode 100644 TBF/Screens/MeasurementTabPageCtrl.resx delete mode 100644 TBF/TBF_TemporaryKey.pfx rename TBF/{ => UI/Bench/Components}/ComponentsManagerDlg.Designer.cs (90%) rename TBF/{ => UI/Bench/Components}/ComponentsManagerDlg.cs (97%) rename TBF/{ => UI/Bench/Components}/ComponentsManagerDlg.resx (100%) rename TBF/{ => UI/Bench/Components}/SelectComponentClassDlg.Designer.cs (97%) rename TBF/{ => UI/Bench/Components}/SelectComponentClassDlg.cs (96%) rename TBF/{ => UI/Bench/Components}/SelectComponentClassDlg.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/IMetrologyDlgTab.cs (55%) rename TBF/{ => UI/Bench/Metrology}/MetrologyDlg.Designer.cs (95%) rename TBF/{ => UI/Bench/Metrology}/MetrologyDlg.cs (99%) rename TBF/{ => UI/Bench/Metrology}/MetrologyDlg.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgBalanceTab.Designer.cs (98%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgBalanceTab.cs (96%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgBalanceTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgDensityTab.Designer.cs (98%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgDensityTab.cs (97%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgDensityTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgDiverterTab.Designer.cs (98%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgDiverterTab.cs (94%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgDiverterTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgEvaporationTab.Designer.cs (98%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgEvaporationTab.cs (94%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgEvaporationTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgFlowMeterTab.Designer.cs (98%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgFlowMeterTab.cs (96%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgFlowMeterTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgLevelMeterTab.Designer.cs (98%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgLevelMeterTab.cs (94%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgLevelMeterTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs (99%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgPlatinumResistanceTMeterTab.cs (99%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgPlatinumResistanceTMeterTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgPressMeterTab.Designer.cs (96%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgPressMeterTab.cs (95%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgPressMeterTab.resx (100%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgTempMeterTab.Designer.cs (97%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgTempMeterTab.cs (95%) rename TBF/{UiControls => UI/Bench/Metrology}/MetrologyDlgTempMeterTab.resx (100%) rename TBF/{UiControls => UI/Bench/Paths}/PathsBenchCtrl.cs (86%) rename TBF/{ => UI/Bench/Paths}/PathsDlg.Designer.cs (92%) rename TBF/{ => UI/Bench/Paths}/PathsDlg.cs (98%) rename TBF/{ => UI/Bench/Paths}/PathsDlg.resx (100%) rename TBF/{UiControls => UI/Bench/Paths}/PathsFeedingCtrl.cs (91%) rename TBF/{UiControls => UI/Bench/Paths}/PathsHeatMetersCtrl.cs (95%) rename TBF/{UiControls => UI/Bench/Paths}/PathsMetersCtrl.cs (90%) rename TBF/{UiControls => UI/Bench/Paths}/PathsOutputCtrl.cs (85%) rename TBF/{UiControls => UI/Bench/Transitions}/TransitionStepsCtrl.cs (93%) rename TBF/{ => UI/Bench/Transitions}/TransitionsDlg.Designer.cs (95%) rename TBF/{ => UI/Bench/Transitions}/TransitionsDlg.cs (98%) rename TBF/{ => UI/Bench/Transitions}/TransitionsDlg.resx (100%) rename TBF/{UiControls => UI/Bench/Transitions}/VirtualBenchStepsCtrl.cs (91%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl.Designer.cs (98%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl.cs (93%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl.resx (100%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl2.Designer.cs (98%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl2.cs (93%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl2.resx (100%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl3.Designer.cs (98%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl3.cs (93%) rename TBF/{UiControls => UI/Camera}/CameraPictureCtrl3.resx (100%) rename TBF/{UiControls => UI/Camera}/CameraPictureFullCtrl.Designer.cs (99%) rename TBF/{UiControls => UI/Camera}/CameraPictureFullCtrl.cs (92%) rename TBF/{UiControls => UI/Camera}/CameraPictureFullCtrl.resx (100%) rename TBF/{UiControls => UI/Camera}/ICameraPicture.cs (73%) rename TBF/{Screens => UI/Camera}/PicturesTabPageCtrl.Designer.cs (98%) rename TBF/{Screens => UI/Camera}/PicturesTabPageCtrl.cs (82%) rename TBF/{Screens => UI/Camera}/PicturesTabPageCtrl.resx (100%) create mode 100644 TBF/UI/Constants.cs rename TBF/{Screens => UI/Graphs}/GraphsTabPageCtrl.cs (99%) rename TBF/{Screens => UI/Graphs}/GraphsTabPageCtrl.designer.cs (99%) rename TBF/{Screens => UI/Graphs}/GraphsTabPageCtrl.resx (100%) rename TBF/{Forms => UI/Help}/AboutDlg.Designer.cs (98%) rename TBF/{Forms => UI/Help}/AboutDlg.cs (94%) rename TBF/{Forms => UI/Help}/AboutDlg.resx (100%) rename TBF/{Screens => UI/Logs}/LogsTabPageCtrl.Designer.cs (97%) rename TBF/{Screens => UI/Logs}/LogsTabPageCtrl.cs (91%) rename TBF/{Screens => UI/Logs}/LogsTabPageCtrl.resx (100%) rename TBF/{ => UI}/MainWnd.Designer.cs (83%) rename TBF/{ => UI}/MainWnd.cs (93%) rename TBF/{ => UI}/MainWnd.cs.resx (100%) rename TBF/{ => UI}/MainWnd.de.resx (100%) rename TBF/{ => UI}/MainWnd.it.resx (100%) rename TBF/{ => UI}/MainWnd.pl.resx (100%) rename TBF/{ => UI}/MainWnd.resx (94%) rename TBF/{ => UI}/MainWnd.ru.resx (100%) rename TBF/{ => UI}/MainWnd.zh-CN.resx (100%) rename TBF/{ => UI/Procedures}/ProcedureDlg.Designer.cs (96%) rename TBF/{ => UI/Procedures}/ProcedureDlg.cs (96%) rename TBF/{ => UI/Procedures}/ProcedureDlg.resx (100%) rename TBF/{UiControls => UI/Procedures}/ProcedureParamsCtrl.Designer.cs (88%) rename TBF/{UiControls => UI/Procedures}/ProcedureParamsCtrl.cs (90%) rename TBF/{UiControls => UI/Procedures}/ProcedureParamsCtrl.resx (100%) rename TBF/{UiControls => UI/Procedures}/ProceduresCtrl.cs (94%) rename TBF/{ => UI/Procedures}/ProceduresDlg.Designer.cs (93%) rename TBF/{ => UI/Procedures}/ProceduresDlg.cs (98%) rename TBF/{ => UI/Procedures}/ProceduresDlg.resx (100%) rename TBF/{UiControls => UI/Procedures}/TestParamsCtrl.Designer.cs (88%) rename TBF/{UiControls => UI/Procedures}/TestParamsCtrl.cs (91%) rename TBF/{UiControls => UI/Procedures}/TestParamsCtrl.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/FlowSelection.Designer.cs (99%) rename TBF/{ => UI/Procedures}/TestWizard/FlowSelection.cs (98%) rename TBF/{ => UI/Procedures}/TestWizard/FlowSelection.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/HeatMetersSelection.Designer.cs (99%) rename TBF/{ => UI/Procedures}/TestWizard/HeatMetersSelection.cs (97%) rename TBF/{ => UI/Procedures}/TestWizard/HeatMetersSelection.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/MethodSelection.Designer.cs (98%) rename TBF/{ => UI/Procedures}/TestWizard/MethodSelection.cs (96%) rename TBF/{ => UI/Procedures}/TestWizard/MethodSelection.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/PressureSelection.cs (96%) rename TBF/{ => UI/Procedures}/TestWizard/PressureSelection.designer.cs (98%) rename TBF/{ => UI/Procedures}/TestWizard/PressureSelection.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/Roi1.Designer.cs (98%) rename TBF/{ => UI/Procedures}/TestWizard/Roi1.cs (97%) rename TBF/{ => UI/Procedures}/TestWizard/Roi1.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/Roi2.Designer.cs (98%) rename TBF/{ => UI/Procedures}/TestWizard/Roi2.cs (95%) rename TBF/{ => UI/Procedures}/TestWizard/Roi2.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/Roi3.Designer.cs (98%) rename TBF/{ => UI/Procedures}/TestWizard/Roi3.cs (96%) rename TBF/{ => UI/Procedures}/TestWizard/Roi3.resx (100%) rename TBF/{ => UI/Procedures}/TestWizard/RoiData.cs (94%) rename TBF/{ => UI/Procedures}/TestWizard/VolumeAndErrorSelection.Designer.cs (99%) rename TBF/{ => UI/Procedures}/TestWizard/VolumeAndErrorSelection.cs (98%) rename TBF/{ => UI/Procedures}/TestWizard/VolumeAndErrorSelection.resx (100%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl24.Designer.cs (99%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl24.cs (97%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl24.resx (100%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl48.Designer.cs (99%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl48.cs (97%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl48.resx (100%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl6.Designer.cs (99%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl6.cs (97%) rename TBF/{Screens => UI/Process}/ProcessTabPageCtrl6.resx (100%) rename TBF/{Screens => UI/Process}/ProcessTabPageExCtrl.Designer.cs (99%) rename TBF/{Screens => UI/Process}/ProcessTabPageExCtrl.cs (96%) rename TBF/{Screens => UI/Process}/ProcessTabPageExCtrl.resx (100%) rename TBF/{Forms => UI/Results}/PreviousResultCtrl.Designer.cs (99%) rename TBF/{Forms => UI/Results}/PreviousResultCtrl.cs (98%) rename TBF/{Forms => UI/Results}/PreviousResultCtrl.resx (100%) rename TBF/{Forms => UI/Results}/PreviousResultIdEventArgs.cs (87%) rename TBF/{Forms => UI/Results}/PreviousResultsDlg.Designer.cs (99%) rename TBF/{Forms => UI/Results}/PreviousResultsDlg.cs (92%) rename TBF/{Forms => UI/Results}/PreviousResultsDlg.resx (100%) rename TBF/{Forms => UI/Results}/ResultsArrangementDlg.Designer.cs (98%) rename TBF/{Forms => UI/Results}/ResultsArrangementDlg.cs (98%) rename TBF/{Forms => UI/Results}/ResultsArrangementDlg.resx (100%) rename TBF/{Screens => UI/Results}/ResultsTabPageCtrl.Designer.cs (99%) rename TBF/{Screens => UI/Results}/ResultsTabPageCtrl.cs (87%) rename TBF/{Screens => UI/Results}/ResultsTabPageCtrl.resx (100%) rename TBF/{ => UI/Settings}/BenchesDlg.Designer.cs (98%) rename TBF/{ => UI/Settings}/BenchesDlg.cs (89%) rename TBF/{ => UI/Settings}/BenchesDlg.resx (100%) rename TBF/{Forms => UI/Settings}/DatabaseSettingsDlg.Designer.cs (99%) rename TBF/{Forms => UI/Settings}/DatabaseSettingsDlg.cs (97%) rename TBF/{Forms => UI/Settings}/DatabaseSettingsDlg.resx (100%) rename TBF/{PreferencesDlg.cs => UI/Settings/LanguageDlg.cs} (95%) rename TBF/{PreferencesDlg.Designer.cs => UI/Settings/LanguageDlg.designer.cs} (94%) rename TBF/{PreferencesDlg.resx => UI/Settings/LanguageDlg.resx} (100%) rename TBF/{Forms => UI/Settings}/UpgradeSelectionDlg.Designer.cs (99%) rename TBF/{Forms => UI/Settings}/UpgradeSelectionDlg.cs (98%) rename TBF/{Forms => UI/Settings}/UpgradeSelectionDlg.resx (100%) rename TBF/{UiControls => UI/Shared}/BaseWithListViewEx.cs (96%) rename TBF/{UiControls => UI/Shared}/BenchControlPanel.Designer.cs (99%) rename TBF/{UiControls => UI/Shared}/BenchControlPanel.cs (99%) rename TBF/{UiControls => UI/Shared}/BenchControlPanel.cs.resx (100%) rename TBF/{UiControls => UI/Shared}/BenchControlPanel.de.resx (100%) rename TBF/{UiControls => UI/Shared}/BenchControlPanel.it.resx (100%) rename TBF/{UiControls => UI/Shared}/BenchControlPanel.pl.resx (100%) rename TBF/{UiControls => UI/Shared}/BenchControlPanel.resx (100%) rename TBF/{Forms => UI/Shared}/ClosingTbfForm.Designer.cs (99%) rename TBF/{Forms => UI/Shared}/ClosingTbfForm.cs (96%) rename TBF/{Forms => UI/Shared}/ClosingTbfForm.resx (100%) rename TBF/{Forms => UI/Shared}/EmergencyStopForm.cs (96%) rename TBF/{Forms => UI/Shared}/EmergencyStopForm.designer.cs (97%) rename TBF/{Forms => UI/Shared}/EmergencyStopForm.resx (100%) rename TBF/{Forms => UI/Shared}/ErrorDlg.Designer.cs (97%) rename TBF/{Forms => UI/Shared}/ErrorDlg.cs (93%) rename TBF/{Forms => UI/Shared}/ErrorDlg.resx (100%) rename TBF/{UiControls => UI/Shared}/IParentOfListViewEx.cs (62%) rename TBF/{UiControls => UI/Shared}/ITabWithListViewEx.cs (85%) rename TBF/{Forms => UI/Shared}/LoginDlgWithBenchSelection.cs (99%) rename TBF/{Forms => UI/Shared}/LoginDlgWithBenchSelection.designer.cs (98%) rename TBF/{Forms => UI/Shared}/LoginDlgWithBenchSelection.resx (100%) rename TBF/{Forms => UI/Shared}/ModelessActivityForm.cs (99%) rename TBF/{Forms => UI/Shared}/ModelessActivityForm.designer.cs (99%) rename TBF/{Forms => UI/Shared}/ModelessActivityForm.resx (100%) rename TBF/{Forms => UI/Shared}/NoBenchOrDatabaseDlg.Designer.cs (98%) rename TBF/{Forms => UI/Shared}/NoBenchOrDatabaseDlg.cs (95%) rename TBF/{Forms => UI/Shared}/NoBenchOrDatabaseDlg.resx (100%) rename TBF/{Forms => UI/Shared}/PrintOrderForm.Designer.cs (98%) rename TBF/{Forms => UI/Shared}/PrintOrderForm.cs (97%) rename TBF/{Forms => UI/Shared}/PrintOrderForm.resx (100%) rename TBF/{Forms => UI/Shared}/RemarkDlg.Designer.cs (99%) rename TBF/{Forms => UI/Shared}/RemarkDlg.cs (95%) rename TBF/{Forms => UI/Shared}/RemarkDlg.resx (100%) rename TBF/{UiControls => UI/Shared}/SharedButtons.Designer.cs (99%) rename TBF/{UiControls => UI/Shared}/SharedButtons.cs (99%) rename TBF/{UiControls => UI/Shared}/SharedButtons.resx (100%) rename TBF/{Forms => UI/Shared}/TabNameDlg.Designer.cs (98%) rename TBF/{Forms => UI/Shared}/TabNameDlg.cs (94%) rename TBF/{Forms => UI/Shared}/TabNameDlg.resx (100%) rename TBF/{UiControls => UI/Shared}/TestProgressCtrl.Designer.cs (96%) rename TBF/{UiControls => UI/Shared}/TestProgressCtrl.cs (92%) rename TBF/{UiControls => UI/Shared}/TestProgressCtrl.resx (100%) rename TBF/{ => UI}/TestProgressControls.cs (86%) delete mode 100644 TBF/UiControls/BenchControlPanel.ru.resx delete mode 100644 TBF/UiControls/BenchControlPanel.zh-CN.resx diff --git a/DeviceTest/DeviceTestDlg.cs b/DeviceTest/DeviceTestDlg.cs index 1688eff89..1e7b39931 100644 --- a/DeviceTest/DeviceTestDlg.cs +++ b/DeviceTest/DeviceTestDlg.cs @@ -425,7 +425,7 @@ namespace DeviceTest cfgControl.Config = parentCfg; cfgControl.Config.ItemNr = 0; - TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg(); + ComponentParametersDlg cfgForm = new ComponentParametersDlg(); cfgForm.TbfComponents = new List(); cfgForm.ComponentCfgCtrl = cfgControl; @@ -454,7 +454,7 @@ namespace DeviceTest cfgControl.Config = component1Cfg; cfgControl.Config.ItemNr = 1; - TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg(); + ComponentParametersDlg cfgForm = new ComponentParametersDlg(); /// IList compEntities = new List(); if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity()); @@ -488,7 +488,7 @@ namespace DeviceTest cfgControl.Config = component2Cfg; cfgControl.Config.ItemNr = 1; - TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg(); + ComponentParametersDlg cfgForm = new ComponentParametersDlg(); /// IList compEntities = new List(); if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity()); @@ -523,7 +523,7 @@ namespace DeviceTest cfgControl.Config = component3Cfg; cfgControl.Config.ItemNr = 1; - TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg(); + ComponentParametersDlg cfgForm = new ComponentParametersDlg(); /// IList compEntities = new List(); if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity()); diff --git a/ResultsBrowser/Forms/PrinterConfigDlg.cs b/ResultsBrowser/Forms/PrinterConfigDlg.cs index e11b14e63..d0a82487d 100644 --- a/ResultsBrowser/Forms/PrinterConfigDlg.cs +++ b/ResultsBrowser/Forms/PrinterConfigDlg.cs @@ -91,7 +91,7 @@ namespace ResultsBrowser.Forms cfgControl.Config = printerCfg; cfgControl.Config.ItemNr = 0; - TBF.ComponentParametersDlg cfgForm = new TBF.ComponentParametersDlg(); + TBF.BenchControl.ComponentParametersDlg cfgForm = new TBF.BenchControl.ComponentParametersDlg(); cfgForm.TbfComponents = new List(); cfgForm.ComponentCfgCtrl = cfgControl; diff --git a/TBF/AttachedTextBoxes.cs b/TBF/AttachedTextBoxes.cs deleted file mode 100644 index fe6bd77d4..000000000 --- a/TBF/AttachedTextBoxes.cs +++ /dev/null @@ -1,176 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Collections.Generic; -using System.Text; -using System.Windows.Forms; - -namespace TBF -{ - /// - /// Data types and orientation of the table layout panel attached data. - /// - public enum Arrangement - { - RowOfIntegers, - RowOfDoubles, - RowOfStrings, - ColumnOfIntegers, - ColumnOfDoubles, - ColumnOfStrings, - } - - /// - /// This class represents TextBox controls and data modified by them - /// that are attached to (=displayed inside) a TableLayoutPanel control. - /// - public class AttachedTextBoxes - { - /// - /// Private fields - /// - int count; /// Number of attached TextBoxes / cells - Arrangement arngmnt; /// Type of attachemnt (see above) - bool isRow; /// true if it is a row - TextBox[] textBoxes; /// TextBox controls to be aded to TableLayoutPanel - int[] intData; /// integer data | - double[] doubleData; /// double data |-> one of these three arrays is used - string[] stringData; /// string data | - - /// - /// Constructor, which creates TextBox controls and adds them to the table layout panel. - /// - public AttachedTextBoxes(TableLayoutPanel tblLtPnl, Arrangement arngmnt, int firstColumn, int firstRow, int size) - { - this.count = size; - this.arngmnt = arngmnt; - isRow = (arngmnt == Arrangement.RowOfIntegers || arngmnt == Arrangement.RowOfDoubles || arngmnt == Arrangement.RowOfStrings); - - textBoxes = new TextBox[count]; - intData = new int[count]; - doubleData = new double[count]; - stringData = new string[count]; - - for (int i = 0; i < count; i++) - { - textBoxes[i] = new TextBox(); /// Crete a new TextBox control - - if (isRow) - { - tblLtPnl.Controls.Add(textBoxes[i], firstColumn + i, firstRow); - } - else - { - tblLtPnl.Controls.Add(textBoxes[i], firstColumn, firstRow + i); - } - } - } - - /// - /// Attached data array size - /// - public int Count { get { return count; } } - - /// - /// Indexer returning a TextBox - /// - /// Index - /// TextBox object reference - public TextBox this[int index] - { - get - { - if (index < 0 || index >= count) - { - return null; - } - else - { - return textBoxes[index]; - } - } - } - - /// - /// Retrieves data from the controls or detects a format error. - /// Wrong format in a cell interrupts data retrieving, so when the first control - /// contains data with wrong format, no data are retrieved at all. - /// - /// true if all data have correct format - public bool ValidateData() - { - switch (arngmnt) - { - case Arrangement.RowOfIntegers: - case Arrangement.ColumnOfIntegers: - for (int i = 0; i < count; i++) - { - if (!Int32.TryParse(textBoxes[i].Text, out intData[i])) return false; - } - return true; - - case Arrangement.RowOfDoubles: - case Arrangement.ColumnOfDoubles: - for (int i = 0; i < count; i++) - { - if (!Double.TryParse(textBoxes[i].Text, out doubleData[i])) return false; - } - return true; - - case Arrangement.RowOfStrings: - case Arrangement.ColumnOfStrings: - default: - return true; - } - } - - /// - /// The following three methods provide initialization of controls with original data. - /// - - public void SetData(int index, int value) - { - if (index < 0 || index >= count) return; - intData[index] = value; - textBoxes[index].Text = value.ToString(); - } - - public void SetData(int index, double value) - { - if (index < 0 || index >= count) return; - doubleData[index] = value; - textBoxes[index].Text = value.ToString(); - } - - public void SetData(int index, string value) - { - if (index < 0 || index >= count) return; - stringData[index] = value; - textBoxes[index].Text = value; - } - - /// - /// The following three methods provide retrieving data from controls. - /// ValidateData() must be called first. The return value must be true. - /// - - public int GetIntData(int index) - { - if (index < 0 || index >= count) return 0; - return intData[index]; - } - - public double GetDoubleData(int index) - { - if (index < 0 || index >= count) return 0; - return doubleData[index]; - } - - public string GetStringData(int index) - { - if (index < 0 || index >= count) return null; - return textBoxes[index].Text; - } - } -} diff --git a/TBF/BarGraph.cs b/TBF/BarGraph.cs deleted file mode 100644 index 0b62a596d..000000000 --- a/TBF/BarGraph.cs +++ /dev/null @@ -1,75 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Drawing; -using System.Windows.Forms; - -namespace TBF -{ - public class BarGraph - { - int originX; /// Left coordinate of the bar - int originY; /// Top coordinate of the bar - int barWidth; /// Bar width, the bar is actualy 1 pixel wider - int barHeight; /// Bar height the bat is actualy 1 pixel higher - Color barColor; /// Bar color - Color backColor; /// Background color (above the bar) - /// Bar border is always black, 1 pixel wide - int barValue; /// The actual bar size (the bar is drawn from bottom) - - System.Windows.Forms.Control control; - Rectangle rect; - - - /// Use this setter to update the bar size - public float FValue - { - get { return (float)barValue/(float)barHeight; } - set - { - Value = (int)(value * (float)barHeight); - control.Invalidate(); - } - } - - /// Use this setter to update the bar size - public int Value - { - get { return barValue; } - set - { - if (value < 0) barValue = 0; - else if (value >= barHeight) barValue = barHeight; - else barValue = value; - control.Invalidate(); - } - } - - /// - /// Constructor - /// - public BarGraph(System.Windows.Forms.Control control, int originX, int originY, int barWidth, int barHeight, Color barColor, Color backColor) - { - this.control = control; - this.originX = originX; - this.originY = originY; - this.barWidth = barWidth; - this.barHeight = barHeight; - this.barColor = barColor; - this.backColor = backColor; - rect = new Rectangle(originX, originY, barWidth + 1, barHeight + 1); - barValue = 0; - } - - /// - /// Call this function in Form1_Paint(..), pass the arguments without any modifications - /// - public void Paint(Graphics g) - { - g.FillRectangle(new SolidBrush(backColor), originX + 1, originY + 1, barWidth, barHeight - barValue); - g.FillRectangle(new SolidBrush(barColor), originX + 1, originY + barHeight + 1 - barValue, barWidth, barValue); - g.DrawRectangle(new Pen(Color.Black, 2.0F), originX, originY, barWidth + 1, barHeight + 1); - } - } -} diff --git a/TBF/ComponentParametersDlg.Designer.cs b/TBF/BenchControl/ComponentParametersDlg.Designer.cs similarity index 94% rename from TBF/ComponentParametersDlg.Designer.cs rename to TBF/BenchControl/ComponentParametersDlg.Designer.cs index b66cd93cc..f20617327 100644 --- a/TBF/ComponentParametersDlg.Designer.cs +++ b/TBF/BenchControl/ComponentParametersDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF +namespace TBF.BenchControl { partial class ComponentParametersDlg { @@ -32,7 +32,7 @@ namespace TBF private void InitializeComponent() { this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel2.SuspendLayout(); this.splitContainer.SuspendLayout(); @@ -84,6 +84,6 @@ namespace TBF #endregion private System.Windows.Forms.SplitContainer splitContainer; - private UiControls.SharedButtons sharedButtons; + private TBF.UI.Shared.SharedButtons sharedButtons; } } \ No newline at end of file diff --git a/TBF/ComponentParametersDlg.cs b/TBF/BenchControl/ComponentParametersDlg.cs similarity index 97% rename from TBF/ComponentParametersDlg.cs rename to TBF/BenchControl/ComponentParametersDlg.cs index 8067b7111..856c12821 100644 --- a/TBF/ComponentParametersDlg.cs +++ b/TBF/BenchControl/ComponentParametersDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -7,10 +7,10 @@ using System.Windows.Forms; using Config.Entities; using TBF.BenchControl; using TBF.BenchControl.Generic; -using TBF.UiControls; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF +namespace TBF.BenchControl { public partial class ComponentParametersDlg : Form { diff --git a/TBF/ComponentParametersDlg.resx b/TBF/BenchControl/ComponentParametersDlg.resx similarity index 100% rename from TBF/ComponentParametersDlg.resx rename to TBF/BenchControl/ComponentParametersDlg.resx diff --git a/TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs b/TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs index 0fbf215b8..5245c4019 100644 --- a/TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs +++ b/TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs @@ -134,7 +134,7 @@ namespace TBF.BenchControl.DataEntry.Standard6 private void batchRemarkButton_Click(object sender, EventArgs e) { - TBF.Forms.RemarkDlg dlg = new TBF.Forms.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) }; + TBF.UI.Shared.RemarkDlg dlg = new TBF.UI.Shared.RemarkDlg() { Remark = ((BatchRemark == null) ? string.Empty : BatchRemark) }; if (dlg.ShowDialog() == DialogResult.OK) { BatchRemark = dlg.Remark; diff --git a/TBF/BenchControl/Dummy/Balance/Component.cs b/TBF/BenchControl/Dummy/Balance/Component.cs index 2a4f0eb94..590c8b95f 100644 --- a/TBF/BenchControl/Dummy/Balance/Component.cs +++ b/TBF/BenchControl/Dummy/Balance/Component.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2016-2017 Sensus Metering Systems +/// Copyright (c) 2016-2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -40,19 +40,19 @@ namespace TBF.BenchControl.Dummy.Balance public float BuoyancyPress { get { return 1.013f; } } public float BuoyancyHumi { get { return 50.0f; } } - public IOperation TaringOp(ref TBF.Boxes.DoubleBox tara) + public IOperation TaringOp(ref Boxes.DoubleBox tara) { tara.Val = 0; return this; } - public IOperation ReadMassOp(ref TBF.Boxes.DoubleBox mass) + public IOperation ReadMassOp(ref Boxes.DoubleBox mass) { mass.Val = 0; return this; } - public IOperation ReadStableMassOp(ref TBF.Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method) + public IOperation ReadStableMassOp(ref Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method) { mass.Val = 0; return this; diff --git a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs index edfd17c41..8fdd37dd1 100644 --- a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs @@ -2,11 +2,11 @@ /// Copyright (c) 2017 Sensus Metering Systems /// using System; -using System.Globalization; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; + namespace TBF.BenchControl.Dummy.FlowMeter { public partial class FlowMeterCfgCtrl : UserControl, IComponentCfgCtrl diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs index eb4a21121..ded3cd394 100644 --- a/TBF/BenchControl/Elde/ControlBoardDev.cs +++ b/TBF/BenchControl/Elde/ControlBoardDev.cs @@ -501,7 +501,7 @@ namespace TBF.BenchControl.Elde /// void ShowEmergencyStopForm() { - (new TBF.Forms.EmergencyStopForm()).Show(); + (new TBF.UI.Shared.EmergencyStopForm()).Show(); } diff --git a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs index 4be6d8d3e..e0fede5fd 100644 --- a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs @@ -2,8 +2,6 @@ /// Copyright (c) 2013-2018 Sensus Slovensko a.s. /// using System; -using System.Globalization; -using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Configs; using TBF.BenchControl.Generic; diff --git a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs index 2d3b3a997..0801c325f 100644 --- a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs @@ -2,8 +2,6 @@ /// Copyright (c) 2019 Sensus Slovensko a.s. /// using System; -using System.Globalization; -using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Configs; using TBF.BenchControl.Generic; diff --git a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs index e953c272e..8075b6a16 100644 --- a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs @@ -2,7 +2,6 @@ /// Copyright (c) 2017 Sensus Slovensko a.s. /// using System; -using System.Globalization; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; diff --git a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs index 6305384bc..963a9d1ec 100644 --- a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs +++ b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeter.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using log4net; +using TBF.BenchControl; using TBF.Boxes; namespace TBF.BenchControl.Elde.FlowMeterTwins @@ -15,8 +16,8 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins readonly FlowMeterCfg flowMeterCfg; readonly ControlBoardDev controlBoard; - public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter1; - public readonly TBF.BenchControl.Elde.FlowMeter.FlowMeter FlowMeter2; + public readonly Elde.FlowMeter.FlowMeter FlowMeter1; + public readonly Elde.FlowMeter.FlowMeter FlowMeter2; public int Idx1 { get { return 0; } } public double NominalFlow { get { return flowMeterCfg.NominalFlow; } } @@ -44,10 +45,10 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins controlBoard = (ControlBoardDev)TbfComponents.FindComponent(cfg.ParentName, components); if (controlBoard == null) throw new Exception("Cannot find " + Name + " parent"); - FlowMeter1 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter1, components); + FlowMeter1 = TbfComponents.FindComponent(flowMeterCfg.FlowMeter1, components) as Elde.FlowMeter.FlowMeter; if (FlowMeter1 == null) throw new Exception("Cannot find FlowMeter1 component"); - FlowMeter2 = (TBF.BenchControl.Elde.FlowMeter.FlowMeter)TbfComponents.FindComponent(flowMeterCfg.FlowMeter2, components); + FlowMeter2 = TbfComponents.FindComponent(flowMeterCfg.FlowMeter2, components) as Elde.FlowMeter.FlowMeter; if (FlowMeter2 == null) throw new Exception("Cannot find FlowMeter2 component"); controlBoard.EtCalib[Idx1] = (float)flowMeterCfg.NominalFlow; /// Idx1==0 for FlowMeterTwins diff --git a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs index 9c2eebb48..ba041c74e 100644 --- a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs @@ -2,7 +2,6 @@ /// Copyright (c) 2013-2019 Sensus Slovensko a.s. /// using System; -using System.Globalization; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; diff --git a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs index 68279c212..53833a471 100644 --- a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs @@ -2,7 +2,6 @@ /// Copyright (c) 2015-2018 Sensus Slovensko a.s. /// using System; -using System.Globalization; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; diff --git a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs index d2a146a71..bd5fcefa7 100644 --- a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs @@ -2,7 +2,6 @@ /// Copyright (c) 2015 Sensus Slovensko a.s. /// using System; -using System.Globalization; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; diff --git a/TBF/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs b/TBF/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs index 864869c83..587831929 100644 --- a/TBF/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs +++ b/TBF/BenchControl/Network/Camera/CLP1611/MJpegFrame.cs @@ -9,7 +9,7 @@ namespace TBF.BenchControl.Network.Camera /// public class JpegFrame : RtpFrame { - static readonly ILog log = LogManager.GetLogger(typeof(MainWnd)); + static readonly ILog log = LogManager.GetLogger(typeof(TBF.UI.MainWnd)); #region Statics diff --git a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs index 7b38347b5..775a7d86a 100644 --- a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs +++ b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs @@ -2,7 +2,6 @@ /// Copyright (c) 2019 Sensus Slovensko a.s. /// using System; -using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs index cf62ac85b..c1de248d1 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs @@ -2,7 +2,6 @@ /// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; -using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; diff --git a/TBF/Telegram.cs b/TBF/BenchControl/Telegram.cs similarity index 98% rename from TBF/Telegram.cs rename to TBF/BenchControl/Telegram.cs index cc265bd52..c9dd08304 100644 --- a/TBF/Telegram.cs +++ b/TBF/BenchControl/Telegram.cs @@ -1,11 +1,10 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2019 Sensus Metering Systems /// using System; using System.Collections.Generic; -using System.Text; -namespace TBF +namespace TBF.BenchControl { public class Telegram { diff --git a/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs index 051d5c0fb..420a0cba6 100644 --- a/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs +++ b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs @@ -7,10 +7,11 @@ using System.Windows.Forms; using log4net; using TBF.BenchControl.GenericDevices; using TBF.Resources; +using TBF.UI.Shared; namespace TBF.BenchControl.TestMethods.Endurance { - public partial class CycleDlg : Form, TBF.UiControls.IParentOfListViewEx + public partial class CycleDlg : Form, IParentOfListViewEx { static readonly ILog log = LogManager.GetLogger(typeof(CycleDlg)); @@ -30,7 +31,7 @@ namespace TBF.BenchControl.TestMethods.Endurance public IList Valves; - TBF.UiControls.ITabWithListViewEx seqStepsCtrl; + ITabWithListViewEx seqStepsCtrl; public CycleDlg() @@ -47,10 +48,10 @@ namespace TBF.BenchControl.TestMethods.Endurance /// SharedDlgButtons configuration sharedButtons.RequiredGroupMembership = new Users.Grp.GID[] { Users.Grp.GID.Metrologists }; - sharedButtons.OptionalButtons = TBF.UiControls.SharedButtons.Buttons.Add | - TBF.UiControls.SharedButtons.Buttons.Remove | - TBF.UiControls.SharedButtons.Buttons.Up | - TBF.UiControls.SharedButtons.Buttons.Down; + sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | + SharedButtons.Buttons.Remove | + SharedButtons.Buttons.Up | + SharedButtons.Buttons.Down; sharedButtons.Unlocked += Unlocked; sharedButtons.OKClicked += okButton_Click; sharedButtons.CancelClicked += cancelButton_Click; @@ -59,7 +60,7 @@ namespace TBF.BenchControl.TestMethods.Endurance sharedButtons.UpClicked += upButton_Click; sharedButtons.DownClicked += downButton_Click; - seqStepsCtrl = new CycleStepsCtrl(); + seqStepsCtrl = new CycleStepsCtrl() as ITabWithListViewEx; /// Prepare a list of valves for the endurance test TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config)); @@ -98,7 +99,7 @@ namespace TBF.BenchControl.TestMethods.Endurance { Localize(); - TBF.LocalSettings ls = Program.LocalSettings; + LocalSettings ls = Program.LocalSettings; Width = (ls.EnduranceDlgWidth > 0) ? ls.EnduranceDlgWidth : 1050; Height = (ls.EnduranceDlgHeight > 0) ? ls.EnduranceDlgHeight : 360; Left = (ls.EnduranceDlgLeft != 0) ? ls.EnduranceDlgLeft : 150; @@ -177,8 +178,8 @@ namespace TBF.BenchControl.TestMethods.Endurance seqStepsCtrl.OkBtnClicked(); } slctdTab = tabControl.SelectedIndex; - sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Add); - sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Remove); + sharedButtons.EnableButtons(SharedButtons.Buttons.Add); + sharedButtons.DisableButtons(SharedButtons.Buttons.Remove); RefreshAllTabs(); } @@ -202,32 +203,32 @@ namespace TBF.BenchControl.TestMethods.Endurance if (seqStepsCtrl != null) seqStepsCtrl.MoveDownSelected(); } - public void UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos selectedItemPos) + public void UpdateButtonStates(SharedButtons.SelectedItemPos selectedItemPos) { - if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.None) + if (selectedItemPos == SharedButtons.SelectedItemPos.None) { - sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Up | - TBF.UiControls.SharedButtons.Buttons.Down); + sharedButtons.DisableButtons(SharedButtons.Buttons.Up | + SharedButtons.Buttons.Down); } - else if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.First) + else if (selectedItemPos == SharedButtons.SelectedItemPos.First) { - sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Down); - sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Up); + sharedButtons.EnableButtons(SharedButtons.Buttons.Down); + sharedButtons.DisableButtons(SharedButtons.Buttons.Up); } - else if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.Last) + else if (selectedItemPos == SharedButtons.SelectedItemPos.Last) { - sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Up); - sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Down); + sharedButtons.EnableButtons(SharedButtons.Buttons.Up); + sharedButtons.DisableButtons(SharedButtons.Buttons.Down); } - else if (selectedItemPos == TBF.UiControls.SharedButtons.SelectedItemPos.FirstAndLast) + else if (selectedItemPos == SharedButtons.SelectedItemPos.FirstAndLast) { - sharedButtons.DisableButtons(TBF.UiControls.SharedButtons.Buttons.Up | - TBF.UiControls.SharedButtons.Buttons.Down); + sharedButtons.DisableButtons(SharedButtons.Buttons.Up | + SharedButtons.Buttons.Down); } else { - sharedButtons.EnableButtons(TBF.UiControls.SharedButtons.Buttons.Up | - TBF.UiControls.SharedButtons.Buttons.Down); + sharedButtons.EnableButtons(SharedButtons.Buttons.Up | + SharedButtons.Buttons.Down); } } @@ -240,23 +241,23 @@ namespace TBF.BenchControl.TestMethods.Endurance Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; if (listViewEx.SelectedItems.Count != 1) { - UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.None); + UpdateButtonStates(SharedButtons.SelectedItemPos.None); } else if (listViewEx.Items.Count == 1) { - UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.FirstAndLast); + UpdateButtonStates(SharedButtons.SelectedItemPos.FirstAndLast); } else if (listViewEx.SelectedIndices[0] == 0) { - UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.First); + UpdateButtonStates(SharedButtons.SelectedItemPos.First); } else if (listViewEx.SelectedIndices[0] == (listViewEx.Items.Count - 1)) { - UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.Last); + UpdateButtonStates(SharedButtons.SelectedItemPos.Last); } else { - UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.Middle); + UpdateButtonStates(SharedButtons.SelectedItemPos.Middle); } } } diff --git a/TBF/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs index 4f0d0ac55..9ae417905 100644 --- a/TBF/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs +++ b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.designer.cs @@ -34,7 +34,7 @@ namespace TBF.BenchControl.TestMethods.Endurance System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleDlg)); this.mainSplitContainer = new System.Windows.Forms.SplitContainer(); this.tabControl = new System.Windows.Forms.TabControl(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); this.mainSplitContainer.Panel1.SuspendLayout(); this.mainSplitContainer.Panel2.SuspendLayout(); @@ -86,6 +86,6 @@ namespace TBF.BenchControl.TestMethods.Endurance private System.Windows.Forms.SplitContainer mainSplitContainer; private System.Windows.Forms.TabControl tabControl; - private UiControls.SharedButtons sharedButtons; + private TBF.UI.Shared.SharedButtons sharedButtons; } } \ No newline at end of file diff --git a/TBF/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs b/TBF/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs index 68f5bfc19..f16dbbfec 100644 --- a/TBF/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs +++ b/TBF/BenchControl/TestMethods/Endurance/CycleStepsCtrl.cs @@ -7,10 +7,11 @@ using System.Windows.Forms; using log4net; using TBF.BenchControl.GenericDevices; using TBF.Resources; +using TBF.UI.Shared; namespace TBF.BenchControl.TestMethods.Endurance { - public partial class CycleStepsCtrl : TBF.UiControls.BaseWithListViewEx, TBF.UiControls.ITabWithListViewEx + public partial class CycleStepsCtrl : BaseWithListViewEx, ITabWithListViewEx { static readonly ILog log = LogManager.GetLogger(typeof(CycleStepsCtrl)); @@ -54,13 +55,13 @@ namespace TBF.BenchControl.TestMethods.Endurance /// /// ListViewEx columns /// - Columns.Add(Strings.Duration_ms, 100 * parent.Dpi / PathsDlg.Dpi100pct); - //Columns.Add(Strings.Message, 100 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Duration_ms, 100 * parent.Dpi / UI.Constants.Dpi100pct); + //Columns.Add(Strings.Message, 100 * parent.Dpi / UI.Constants.Dpi100pct); /// vCount = 0; foreach (var vlv in parent.Valves) { - Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(vlv.Cfg.Name, 50 * parent.Dpi / UI.Constants.Dpi100pct); vCount++; } @@ -256,7 +257,7 @@ namespace TBF.BenchControl.TestMethods.Endurance bool lastItemRemoved = base.RemoveSelected(); if (lastItemRemoved && parent != null) { - parent.UpdateButtonStates(TBF.UiControls.SharedButtons.SelectedItemPos.None); + parent.UpdateButtonStates(SharedButtons.SelectedItemPos.None); } } diff --git a/TBF/CustomStyle.cs b/TBF/CustomStyle.cs deleted file mode 100644 index 8f99d858e..000000000 --- a/TBF/CustomStyle.cs +++ /dev/null @@ -1,86 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace TBF -{ - /// - /// This static class maintains a set of text box styles at one place, it is then sufficient - /// to use the static method CustomStyle.Apply(id, textBox(es)) to apply this style to text box(es). - /// - public static class CustomStyle - { - const int setsCount = 20; /// Number of styles / attribute sets - - static DockStyle[] dockStyles; /// Docking style - static System.Drawing.Color[] backColors; /// Background color - static BorderStyle[] borderStyles; /// Border style - static bool[] readOnly; /// Read only - static System.Drawing.Font[] fonts; /// Font - - static CustomStyle() - { - dockStyles = new DockStyle[setsCount]; - backColors = new System.Drawing.Color[setsCount]; - borderStyles = new BorderStyle[setsCount]; - readOnly = new bool[setsCount]; - fonts = new System.Drawing.Font[setsCount]; - } - - /// - /// Set attributes of the set selected by 'set' parameter - /// - /// Attribute set ID - /// Docking style - /// Background color - /// true for read only (aka label) - /// Border style - public static void Set(int id, DockStyle dockStyle, System.Drawing.Color backColor, BorderStyle borderStyle, bool readOnly, System.Drawing.Font font) - { - if (id < 0 || id >= setsCount) return; - - CustomStyle.dockStyles[id] = dockStyle; - CustomStyle.backColors[id] = backColor; - CustomStyle.borderStyles[id] = borderStyle; - CustomStyle.readOnly[id] = readOnly; - CustomStyle.fonts[id] = font; - } - - /// - /// Apply one of the attribute sets to a TextBox instance - /// - public static void Apply(int id, TextBox textBox) - { - if (id < 0 || id >= setsCount) return; - - textBox.Dock = dockStyles[id]; - textBox.BackColor = backColors[id]; - textBox.BorderStyle = borderStyles[id]; - textBox.ReadOnly = readOnly[id]; - textBox.Font = fonts[id]; - } - - /// - /// Apply one of the attribute sets to a AttachedTextBoxes text boxes - /// - public static void Apply(int id, AttachedTextBoxes textBoxes) - { - if (id < 0 || id >= setsCount) return; - - for (int i = 0; i < textBoxes.Count; i++) - { - textBoxes[i].Dock = dockStyles[id]; - textBoxes[i].BackColor = backColors[id]; - textBoxes[i].BorderStyle = borderStyles[id]; - textBoxes[i].ReadOnly = readOnly[id]; - textBoxes[i].Font = fonts[id]; - } - } - } -} diff --git a/TBF/ErrorHandler.cs b/TBF/ErrorHandler.cs deleted file mode 100644 index 58da41ff3..000000000 --- a/TBF/ErrorHandler.cs +++ /dev/null @@ -1,34 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Windows.Forms; -using TBF.Forms; -using TBF.Resources; - -namespace TBF.ErrorHandler { - - public static class ErrorHandler - { - public static DialogResult HandleError(Exception e, string Message, string Origin) - { - - //catch (FluentNHibernate.Cfg.FluentConfigurationException fe) - // { - // string message; - // if (fe.InnerException != null) - // { - // message = fe.InnerException.Message; - // } - // else - // { - // message = fe.Message; - // } - // MessageBox.Show( message, "RetVal", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - - ErrorDlg dlg = new ErrorDlg(Strings.Unhandled_error_occured_in_ + Origin + Environment.NewLine + Message + Environment.NewLine + e.ToString() + Environment.NewLine + e.InnerException.ToString()); - dlg.ShowDialog(); - return dlg.returnvalue; - } - } -} diff --git a/TBF/Forms/AboutDlg.pl.resx b/TBF/KeepAsBackup/AboutDlg.pl.resx similarity index 100% rename from TBF/Forms/AboutDlg.pl.resx rename to TBF/KeepAsBackup/AboutDlg.pl.resx diff --git a/TBF/Forms/AboutDlg.ru.resx b/TBF/KeepAsBackup/AboutDlg.ru.resx similarity index 100% rename from TBF/Forms/AboutDlg.ru.resx rename to TBF/KeepAsBackup/AboutDlg.ru.resx diff --git a/TBF/BenchesDlg.pl.resx b/TBF/KeepAsBackup/BenchesDlg.pl.resx similarity index 100% rename from TBF/BenchesDlg.pl.resx rename to TBF/KeepAsBackup/BenchesDlg.pl.resx diff --git a/TBF/BenchesDlg.ru.resx b/TBF/KeepAsBackup/BenchesDlg.ru.resx similarity index 100% rename from TBF/BenchesDlg.ru.resx rename to TBF/KeepAsBackup/BenchesDlg.ru.resx diff --git a/TBF/ComponentsManagerDlg.pl.resx b/TBF/KeepAsBackup/ComponentsManagerDlg.pl.resx similarity index 100% rename from TBF/ComponentsManagerDlg.pl.resx rename to TBF/KeepAsBackup/ComponentsManagerDlg.pl.resx diff --git a/TBF/ComponentsManagerDlg.ru.resx b/TBF/KeepAsBackup/ComponentsManagerDlg.ru.resx similarity index 100% rename from TBF/ComponentsManagerDlg.ru.resx rename to TBF/KeepAsBackup/ComponentsManagerDlg.ru.resx diff --git a/TBF/PathsDlg.pl.resx b/TBF/KeepAsBackup/PathsDlg.pl.resx similarity index 100% rename from TBF/PathsDlg.pl.resx rename to TBF/KeepAsBackup/PathsDlg.pl.resx diff --git a/TBF/PathsDlg.ru.resx b/TBF/KeepAsBackup/PathsDlg.ru.resx similarity index 100% rename from TBF/PathsDlg.ru.resx rename to TBF/KeepAsBackup/PathsDlg.ru.resx diff --git a/TBF/PreferencesDlg.pl.resx b/TBF/KeepAsBackup/PreferencesDlg.pl.resx similarity index 100% rename from TBF/PreferencesDlg.pl.resx rename to TBF/KeepAsBackup/PreferencesDlg.pl.resx diff --git a/TBF/PreferencesDlg.ru.resx b/TBF/KeepAsBackup/PreferencesDlg.ru.resx similarity index 100% rename from TBF/PreferencesDlg.ru.resx rename to TBF/KeepAsBackup/PreferencesDlg.ru.resx diff --git a/TBF/ProcedureDlg.pl.resx b/TBF/KeepAsBackup/ProcedureDlg.pl.resx similarity index 100% rename from TBF/ProcedureDlg.pl.resx rename to TBF/KeepAsBackup/ProcedureDlg.pl.resx diff --git a/TBF/ProcedureDlg.ru.resx b/TBF/KeepAsBackup/ProcedureDlg.ru.resx similarity index 100% rename from TBF/ProcedureDlg.ru.resx rename to TBF/KeepAsBackup/ProcedureDlg.ru.resx diff --git a/TBF/SelectComponentClassDlg.pl.resx b/TBF/KeepAsBackup/SelectComponentClassDlg.pl.resx similarity index 100% rename from TBF/SelectComponentClassDlg.pl.resx rename to TBF/KeepAsBackup/SelectComponentClassDlg.pl.resx diff --git a/TBF/SelectComponentClassDlg.ru.resx b/TBF/KeepAsBackup/SelectComponentClassDlg.ru.resx similarity index 100% rename from TBF/SelectComponentClassDlg.ru.resx rename to TBF/KeepAsBackup/SelectComponentClassDlg.ru.resx diff --git a/TBF/TransitionsDlg.pl.resx b/TBF/KeepAsBackup/TransitionsDlg.pl.resx similarity index 100% rename from TBF/TransitionsDlg.pl.resx rename to TBF/KeepAsBackup/TransitionsDlg.pl.resx diff --git a/TBF/TransitionsDlg.ru.resx b/TBF/KeepAsBackup/TransitionsDlg.ru.resx similarity index 100% rename from TBF/TransitionsDlg.ru.resx rename to TBF/KeepAsBackup/TransitionsDlg.ru.resx diff --git a/TBF/Program.cs b/TBF/Program.cs index 1943799a4..239b5e42b 100644 --- a/TBF/Program.cs +++ b/TBF/Program.cs @@ -9,7 +9,7 @@ using log4net; using Config.Entities; using Users; using TBF.Resources; -using TBF.Forms; +using TBF.UI.Shared; namespace TBF { @@ -54,7 +54,7 @@ namespace TBF /// /// Main window object. /// - public static MainWnd MainWnd; + public static UI.MainWnd MainWnd; /// @@ -207,9 +207,9 @@ namespace TBF log.Warn("No test benches in the local configuration -> display an appropriate dialog."); /// Ask what to do, ask for the password, open 'DatabaseSetingsDlg' and continue on OK - if ((new Forms.NoBenchOrDatabaseDlg { Message = Strings.NoBenchMsg }.ShowDialog() != DialogResult.OK) || + if ((new NoBenchOrDatabaseDlg { Message = Strings.NoBenchMsg }.ShowDialog() != DialogResult.OK) || (new Users.Forms.LoginDlg(true).ShowDialog() == DialogResult.Cancel) || - (new BenchesDlg().ShowDialog() == DialogResult.Cancel)) + (new TBF.UI.Settings.BenchesDlg().ShowDialog() == DialogResult.Cancel)) { return; /// Exit program } @@ -391,7 +391,7 @@ namespace TBF } /// Ask what to do - switch ((new Forms.NoBenchOrDatabaseDlg { Message = Strings.NoDatabaseMsg, ShowRetry = true }).ShowDialog()) + switch ((new NoBenchOrDatabaseDlg { Message = Strings.NoDatabaseMsg, ShowRetry = true }).ShowDialog()) { case DialogResult.Abort: return; /// Exit program @@ -400,13 +400,13 @@ namespace TBF break; /// Retry connection to the database, stay inside the loop case DialogResult.Yes: - new UpgradeSelectionDlg().ShowDialog(); + new TBF.UI.Settings.UpgradeSelectionDlg().ShowDialog(); break; /// Stay inside the loop default: /// Open 'DatabaseSetingsDlg' and retry DB connect on OK if (new Users.Forms.LoginDlg(true).ShowDialog() == DialogResult.Cancel || - new BenchesDlg().ShowDialog() == DialogResult.Cancel) + new TBF.UI.Settings.BenchesDlg().ShowDialog() == DialogResult.Cancel) { return; /// Exit program } @@ -444,7 +444,7 @@ namespace TBF { /// Open the main application window log.Info("Creating the main window"); - MainWnd = new MainWnd(); + MainWnd = new UI.MainWnd(); log.Info("Opening the main window"); Application.Run(MainWnd); log.Info("The main window was closed"); diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 2816eb06c..ca2203de5 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1313.0")] -[assembly: AssemblyFileVersion("2.18.1313.0")] +[assembly: AssemblyVersion("2.18.1314.0")] +[assembly: AssemblyFileVersion("2.18.1314.0")] diff --git a/TBF/Resources/Strings.Designer.cs b/TBF/Resources/Strings.Designer.cs index 6c5da009a..ae06bceea 100644 --- a/TBF/Resources/Strings.Designer.cs +++ b/TBF/Resources/Strings.Designer.cs @@ -879,6 +879,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Conditions. + /// + internal static string Conditions { + get { + return ResourceManager.GetString("Conditions", resourceCulture); + } + } + /// /// Looks up a localized string similar to Configuration. /// @@ -2832,6 +2841,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to No info available. + /// + internal static string No_info_available { + get { + return ResourceManager.GetString("No_info_available", resourceCulture); + } + } + /// /// Looks up a localized string similar to No results to print. /// @@ -5481,6 +5499,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Uncertainty. + /// + internal static string Uncertainty { + get { + return ResourceManager.GetString("Uncertainty", resourceCulture); + } + } + /// /// Looks up a localized string similar to Uncertainty [%]. /// diff --git a/TBF/Resources/Strings.resx b/TBF/Resources/Strings.resx index 3423f00f7..541d811bc 100644 --- a/TBF/Resources/Strings.resx +++ b/TBF/Resources/Strings.resx @@ -2053,4 +2053,13 @@ Program must be closed. + + Conditions + + + Uncertainty + + + No info available + \ No newline at end of file diff --git a/TBF/Screens/MeasurementTabPageCtrl.Designer.cs b/TBF/Screens/MeasurementTabPageCtrl.Designer.cs deleted file mode 100644 index acc527aaf..000000000 --- a/TBF/Screens/MeasurementTabPageCtrl.Designer.cs +++ /dev/null @@ -1,208 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -namespace TBF.Screens -{ - partial class MeasurementTabPageCtrl - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.measurementLabel5 = new System.Windows.Forms.Label(); - this.measurementLabel4 = new System.Windows.Forms.Label(); - this.measurementLabel3 = new System.Windows.Forms.Label(); - this.measurementLabel2 = new System.Windows.Forms.Label(); - this.measurementLabel = new System.Windows.Forms.Label(); - this.measurementTableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.measurementTableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.measurementTableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.measurementTableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.SuspendLayout(); - // - // measurementLabel5 - // - this.measurementLabel5.AutoSize = true; - this.measurementLabel5.Font = new System.Drawing.Font("Verdana", 11.25F); - this.measurementLabel5.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.measurementLabel5.Location = new System.Drawing.Point(471, 136); - this.measurementLabel5.Name = "measurementLabel5"; - this.measurementLabel5.Size = new System.Drawing.Size(74, 18); - this.measurementLabel5.TabIndex = 17; - this.measurementLabel5.Text = "Time Bar"; - // - // measurementLabel4 - // - this.measurementLabel4.AutoSize = true; - this.measurementLabel4.Font = new System.Drawing.Font("Verdana", 11.25F); - this.measurementLabel4.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.measurementLabel4.Location = new System.Drawing.Point(328, 136); - this.measurementLabel4.Name = "measurementLabel4"; - this.measurementLabel4.Size = new System.Drawing.Size(74, 18); - this.measurementLabel4.TabIndex = 16; - this.measurementLabel4.Text = "Time Bar"; - // - // measurementLabel3 - // - this.measurementLabel3.AutoSize = true; - this.measurementLabel3.Font = new System.Drawing.Font("Verdana", 11.25F); - this.measurementLabel3.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.measurementLabel3.Location = new System.Drawing.Point(484, 164); - this.measurementLabel3.Name = "measurementLabel3"; - this.measurementLabel3.Size = new System.Drawing.Size(45, 18); - this.measurementLabel3.TabIndex = 15; - this.measurementLabel3.Text = "Total"; - // - // measurementLabel2 - // - this.measurementLabel2.AutoSize = true; - this.measurementLabel2.Font = new System.Drawing.Font("Verdana", 11.25F); - this.measurementLabel2.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.measurementLabel2.Location = new System.Drawing.Point(323, 164); - this.measurementLabel2.Name = "measurementLabel2"; - this.measurementLabel2.Size = new System.Drawing.Size(87, 18); - this.measurementLabel2.TabIndex = 14; - this.measurementLabel2.Text = "Actual test"; - // - // measurementLabel - // - this.measurementLabel.AutoSize = true; - this.measurementLabel.Font = new System.Drawing.Font("Verdana", 11.25F); - this.measurementLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.measurementLabel.Location = new System.Drawing.Point(639, 514); - this.measurementLabel.Name = "measurementLabel"; - this.measurementLabel.Size = new System.Drawing.Size(108, 18); - this.measurementLabel.TabIndex = 13; - this.measurementLabel.Text = "Target values"; - // - // measurementTableLayoutPanel4 - // - this.measurementTableLayoutPanel4.ColumnCount = 3; - this.measurementTableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.measurementTableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.measurementTableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.measurementTableLayoutPanel4.Location = new System.Drawing.Point(642, 544); - this.measurementTableLayoutPanel4.Name = "measurementTableLayoutPanel4"; - this.measurementTableLayoutPanel4.RowCount = 4; - this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.measurementTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.measurementTableLayoutPanel4.Size = new System.Drawing.Size(216, 101); - this.measurementTableLayoutPanel4.TabIndex = 12; - // - // measurementTableLayoutPanel3 - // - this.measurementTableLayoutPanel3.ColumnCount = 3; - this.measurementTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F)); - this.measurementTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F)); - this.measurementTableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 34F)); - this.measurementTableLayoutPanel3.Location = new System.Drawing.Point(521, 11); - this.measurementTableLayoutPanel3.Name = "measurementTableLayoutPanel3"; - this.measurementTableLayoutPanel3.RowCount = 2; - this.measurementTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.measurementTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.measurementTableLayoutPanel3.Size = new System.Drawing.Size(348, 55); - this.measurementTableLayoutPanel3.TabIndex = 11; - // - // measurementTableLayoutPanel2 - // - this.measurementTableLayoutPanel2.ColumnCount = 2; - this.measurementTableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.measurementTableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.measurementTableLayoutPanel2.Location = new System.Drawing.Point(11, 245); - this.measurementTableLayoutPanel2.Name = "measurementTableLayoutPanel2"; - this.measurementTableLayoutPanel2.RowCount = 12; - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel2.Size = new System.Drawing.Size(177, 303); - this.measurementTableLayoutPanel2.TabIndex = 10; - // - // measurementTableLayoutPanel1 - // - this.measurementTableLayoutPanel1.ColumnCount = 3; - this.measurementTableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); - this.measurementTableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F)); - this.measurementTableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F)); - this.measurementTableLayoutPanel1.Location = new System.Drawing.Point(11, 21); - this.measurementTableLayoutPanel1.Name = "measurementTableLayoutPanel1"; - this.measurementTableLayoutPanel1.RowCount = 7; - this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F)); - this.measurementTableLayoutPanel1.Size = new System.Drawing.Size(283, 183); - this.measurementTableLayoutPanel1.TabIndex = 9; - // - // MeasurementTabPageCtrl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200))))); - this.Controls.Add(this.measurementLabel5); - this.Controls.Add(this.measurementLabel4); - this.Controls.Add(this.measurementLabel3); - this.Controls.Add(this.measurementLabel2); - this.Controls.Add(this.measurementLabel); - this.Controls.Add(this.measurementTableLayoutPanel4); - this.Controls.Add(this.measurementTableLayoutPanel3); - this.Controls.Add(this.measurementTableLayoutPanel2); - this.Controls.Add(this.measurementTableLayoutPanel1); - this.Font = new System.Drawing.Font("Verdana", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.Margin = new System.Windows.Forms.Padding(4); - this.Name = "MeasurementTabPageCtrl"; - this.Size = new System.Drawing.Size(900, 689); - this.Paint += new System.Windows.Forms.PaintEventHandler(this.measurement_Paint); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Label measurementLabel5; - private System.Windows.Forms.Label measurementLabel4; - private System.Windows.Forms.Label measurementLabel3; - private System.Windows.Forms.Label measurementLabel2; - private System.Windows.Forms.Label measurementLabel; - private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel4; - private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel3; - private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel2; - private System.Windows.Forms.TableLayoutPanel measurementTableLayoutPanel1; - } -} diff --git a/TBF/Screens/MeasurementTabPageCtrl.cs b/TBF/Screens/MeasurementTabPageCtrl.cs deleted file mode 100644 index 0510ae31c..000000000 --- a/TBF/Screens/MeasurementTabPageCtrl.cs +++ /dev/null @@ -1,183 +0,0 @@ -/// -/// Copyright (c) 2013-2015 Sensus Metering Systems -/// -using System; -using System.Drawing; -using System.Windows.Forms; -using log4net; -using TBF.UiBridge; - -namespace TBF.Screens -{ - public partial class MeasurementTabPageCtrl : UserControl - { - static readonly ILog log = LogManager.GetLogger(typeof(MeasurementTabPageCtrl)); - - AttachedTextBoxes measurementTbl1Row1; /// Table 1 - AttachedTextBoxes measurementTbl1Col1; - AttachedTextBoxes measurementTbl1Col2; - AttachedTextBoxes measurementTbl1Col3; - AttachedTextBoxes measurementTbl2Row1; /// Table 2 - AttachedTextBoxes measurementTbl2Col1; - AttachedTextBoxes measurementTbl2Col2; - AttachedTextBoxes measurementTbl3Row1; /// Table 3 - AttachedTextBoxes measurementTbl3Row2; - AttachedTextBoxes measurementTbl4Col1; - AttachedTextBoxes measurementTbl4Col2; - AttachedTextBoxes measurementTbl4Col3; - - BarGraph measurementBar1; - BarGraph measurementBar2; - - public MeasurementTabPageCtrl() - { - InitializeComponent(); - - //Bridge.TestSelectedHandler += delegate(object sender, TestSelectedEventArgs args) - //{ - // if (InvokeRequired) - // { - // Invoke(new EventHandler(OnTestSelected), sender, args); - // } - // else OnTestSelected(sender, args); - //}; - //Bridge.TestProgressHandler += delegate(object sender, TestProgressEventArgs args) - //{ - // if (InvokeRequired) - // { - // Invoke(new EventHandler(OnTestProgress), sender, args); - // } - // else OnTestProgress(sender, args); - //}; - //Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args) - //{ - // if (InvokeRequired) - // { - // Invoke(new EventHandler(OnTestCompleted), sender, args); - // } - // else OnTestCompleted(sender, args); - //}; - - Init(); - } - - private void Init() - { - measurementTbl1Row1 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.RowOfStrings, 1, 0, 2); - measurementTbl1Col1 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.ColumnOfStrings, 0, 1, 6); - measurementTbl1Col2 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.ColumnOfDoubles, 1, 1, 6); - measurementTbl1Col3 = new AttachedTextBoxes(measurementTableLayoutPanel1, Arrangement.ColumnOfDoubles, 2, 1, 6); - measurementTbl2Row1 = new AttachedTextBoxes(measurementTableLayoutPanel2, Arrangement.RowOfStrings, 1, 0, 1); - measurementTbl2Col1 = new AttachedTextBoxes(measurementTableLayoutPanel2, Arrangement.ColumnOfStrings, 0, 1, 11); - measurementTbl2Col2 = new AttachedTextBoxes(measurementTableLayoutPanel2, Arrangement.ColumnOfDoubles, 1, 1, 11); - measurementTbl3Row1 = new AttachedTextBoxes(measurementTableLayoutPanel3, Arrangement.RowOfStrings, 0, 0, 3); - measurementTbl3Row2 = new AttachedTextBoxes(measurementTableLayoutPanel3, Arrangement.RowOfDoubles, 0, 1, 3); - measurementTbl4Col1 = new AttachedTextBoxes(measurementTableLayoutPanel4, Arrangement.ColumnOfStrings, 0, 0, 4); - measurementTbl4Col2 = new AttachedTextBoxes(measurementTableLayoutPanel4, Arrangement.ColumnOfDoubles, 1, 0, 4); - measurementTbl4Col3 = new AttachedTextBoxes(measurementTableLayoutPanel4, Arrangement.ColumnOfStrings, 2, 0, 4); - - CustomStyle.Apply(1, measurementTbl1Row1); - CustomStyle.Apply(1, measurementTbl1Col1); - CustomStyle.Apply(1, measurementTbl1Col2); - CustomStyle.Apply(1, measurementTbl1Col3); - CustomStyle.Apply(1, measurementTbl2Row1); - CustomStyle.Apply(1, measurementTbl2Col1); - CustomStyle.Apply(1, measurementTbl2Col2); - CustomStyle.Apply(1, measurementTbl3Row1); - CustomStyle.Apply(1, measurementTbl3Row2); - CustomStyle.Apply(1, measurementTbl4Col1); - CustomStyle.Apply(1, measurementTbl4Col2); - CustomStyle.Apply(1, measurementTbl4Col3); - - measurementTbl1Row1.SetData(0, "Vmer"); - measurementTbl1Row1.SetData(1, "Emer"); - for (int i = 0; i < Config.Data.WMsCount; i++) measurementTbl1Col1.SetData(i, "Meter" + (i + 1).ToString()); - - measurementTbl2Row1.SetData(0, "Ergebnise"); - measurementTbl2Col1.SetData(0, "IMP"); - measurementTbl2Col1.SetData(1, "Zeit"); - measurementTbl2Col1.SetData(2, "V_etn"); - measurementTbl2Col1.SetData(3, "Temp up"); - measurementTbl2Col1.SetData(4, "Temp dn"); - measurementTbl2Col1.SetData(5, "T Kl"); - measurementTbl2Col1.SetData(6, "Druck up"); - measurementTbl2Col1.SetData(7, "Druck dn"); - measurementTbl2Col1.SetData(8, "Durchfl. act"); - measurementTbl2Col1.SetData(9, "Zeit Kl in"); - measurementTbl2Col1.SetData(10, "Zeit Kl out"); - - measurementTbl3Row1.SetData(0, "Temp. Luft"); - measurementTbl3Row1.SetData(1, "Druck Luft"); - measurementTbl3Row1.SetData(2, "Humi. Luft"); - - measurementTbl4Col1.SetData(0, "Durchfl. Tar Min"); - measurementTbl4Col1.SetData(1, "Durchfl. Tar Max"); - measurementTbl4Col1.SetData(2, "Volumen Tar"); - measurementTbl4Col1.SetData(3, "Dauer"); - - //measurementTbl4Col2.SetData(0, 1.5); - //measurementTbl4Col2.SetData(1, 1.65); - //measurementTbl4Col2.SetData(2, 50); - //measurementTbl4Col2.SetData(3, 114.29); - - measurementTbl4Col3.SetData(0, "m3/h"); - measurementTbl4Col3.SetData(1, "m3/h"); - measurementTbl4Col3.SetData(2, "l"); - measurementTbl4Col3.SetData(3, "s"); - - measurementBar1 = new BarGraph(this, 320, 200, 100, 400, Color.DarkBlue, Color.WhiteSmoke); - measurementBar2 = new BarGraph(this, 470, 200, 100, 400, Color.DarkBlue, Color.WhiteSmoke); - } - - private void measurement_Paint(object sender, PaintEventArgs e) - { - Graphics g = e.Graphics; - if (measurementBar1 != null) measurementBar1.Paint(g); - if (measurementBar2 != null) measurementBar2.Paint(g); - g.DrawRectangle(new Pen(Color.Black, 2.0F), 500, -2, 402, 80); - g.DrawRectangle(new Pen(Color.Black, 2.0F), 620, 500, 282, 250); - } - - - public void OnTestSelected(object sender, TestSelectedEventArgs data) - { - measurementTbl4Col2.SetData(0, data.Test.Qfrom.ToString("F2")); - measurementTbl4Col2.SetData(1, data.Test.Qto.ToString("F2")); - measurementTbl4Col2.SetData(2, data.Test.Volume.ToString("F1")); - measurementTbl4Col2.SetData(3, data.Test.TstTime.ToString("F1")); - } - - public void OnTestProgress(object sender, TestProgressEventArgs data) - { - /// TODO: Reimplement - //if (data.TestResult != null) - //{ - // int count = Math.Min(Config.Data.WMsCount, data.TestResult.Meters.Count); - // for (int i = 0; i < count; i++) - // { - // measurementTbl1Col2.SetData(i, data.TestResult.Meters[i].VolumeMeter.ToString("F1")); - // measurementTbl1Col3.SetData(i, data.TestResult.Meters[i].VolumeErrorPct.ToString("F1")); - // } - //} - //measurementTbl2Col2.SetData(0, data.RefPulses); - //measurementTbl2Col2.SetData(1, data.Time.ToString("F1")); - - //measurementTbl2Col2.SetData(3, data.Tin.ToString()); - //measurementTbl2Col2.SetData(4, data.Tout.ToString()); - //measurementTbl2Col2.SetData(5, data.Tdiv.ToString()); - //measurementTbl2Col2.SetData(6, data.Pin.ToString()); - //measurementTbl2Col2.SetData(7, data.Pout.ToString()); - //measurementTbl2Col2.SetData(8, data.Flow.ToString()); - - //measurementTbl3Row2.SetData(0, data.AmbientTemp.ToString()); - //measurementTbl3Row2.SetData(1, data.AmbientPressure.ToString()); - //measurementTbl3Row2.SetData(2, data.AmbientHumidity.ToString()); - - //measurementBar1.FValue = data.Progress; - } - - public void OnTestCompleted(object sender, TestCompletedEventArgs data) - { - } - } -} diff --git a/TBF/Screens/MeasurementTabPageCtrl.resx b/TBF/Screens/MeasurementTabPageCtrl.resx deleted file mode 100644 index 1af7de150..000000000 --- a/TBF/Screens/MeasurementTabPageCtrl.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index c31d315f0..bb190ee0e 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -176,6 +176,12 @@ ComponentCfgCtrl.cs + + Form + + + ComponentParametersDlg.cs + UserControl @@ -1084,6 +1090,7 @@ + Form @@ -1532,55 +1539,6 @@ WaterMeterCfgCtrl.cs - - Form - - - ClosingTbfForm.cs - - - Form - - - DatabaseSettingsDlg.cs - - - Form - - - LoginDlgWithBenchSelection.cs - - - Form - - - ModelessActivityForm.cs - - - UserControl - - - PreviousResultCtrl.cs - - - - Form - - - PreviousResultsDlg.cs - - - Form - - - RemarkDlg.cs - - - Form - - - UpgradeSelectionDlg.cs - @@ -1914,30 +1872,6 @@ - - Form - - - EmergencyStopForm.cs - - - Form - - - PrintOrderForm.cs - - - Form - - - ResultsArrangementDlg.cs - - - Form - - - TabNameDlg.cs - True True @@ -1953,42 +1887,6 @@ True Strings.zh-CN.resx - - UserControl - - - GraphsTabPageCtrl.cs - - - UserControl - - - PicturesTabPageCtrl.cs - - - UserControl - - - ProcessTabPageCtrl24.cs - - - UserControl - - - ProcessTabPageCtrl48.cs - - - UserControl - - - ProcessTabPageExCtrl.cs - - - Form - - - SelectComponentClassDlg.cs - @@ -2031,27 +1929,6 @@ - - Form - - - ComponentParametersDlg.cs - - - Form - - - ComponentsManagerDlg.cs - - - - Form - - - AboutDlg.cs - - - @@ -2061,62 +1938,7 @@ - - - Form - - - BenchesDlg.cs - - - Form - - - ErrorDlg.cs - - - Form - - - NoBenchOrDatabaseDlg.cs - - - Form - - - MetrologyDlg.cs - - - Form - - - PathsDlg.cs - - - Form - - - PreferencesDlg.cs - - - Form - - - MainWnd.cs - - - Form - - - ProcedureDlg.cs - - - Form - - - ProceduresDlg.cs - @@ -2130,91 +1952,10 @@ True Strings.resx - - UserControl - - - ProcessTabPageCtrl6.cs - - - UserControl - - - LogsTabPageCtrl.cs - - - UserControl - - - MeasurementTabPageCtrl.cs - - - UserControl - - - ResultsTabPageCtrl.cs - - - - - Form - - - FlowSelection.cs - - - Form - - - HeatMetersSelection.cs - - - Form - - - MethodSelection.cs - - - Form - - - PressureSelection.cs - - - Form - - - Roi1.cs - - - Form - - - Roi2.cs - - - Form - - - Roi3.cs - - - - Form - - - VolumeAndErrorSelection.cs - - - Form - - - TransitionsDlg.cs - @@ -2234,145 +1975,379 @@ - - Component + + Form - + + ComponentsManagerDlg.cs + + + Form + + + SelectComponentClassDlg.cs + + + + Form + + + MetrologyDlg.cs + + UserControl - - BenchControlPanel.cs - - - UserControl - - - CameraPictureCtrl.cs - - - UserControl - - - CameraPictureCtrl2.cs - - - UserControl - - - CameraPictureCtrl3.cs - - - UserControl - - - CameraPictureFullCtrl.cs - - - - - - - UserControl - - - MetrologyDlgDensityTab.cs - - - UserControl - - - MetrologyDlgDiverterTab.cs - - - UserControl - - - MetrologyDlgEvaporationTab.cs - - - UserControl - - - MetrologyDlgFlowMeterTab.cs - - - UserControl - - + MetrologyDlgBalanceTab.cs - + UserControl - - MetrologyDlgPlatinumResistanceTMeterTab.cs + + MetrologyDlgDensityTab.cs - + UserControl - - MetrologyDlgPressMeterTab.cs + + MetrologyDlgDiverterTab.cs - + UserControl - + + MetrologyDlgEvaporationTab.cs + + + UserControl + + + MetrologyDlgFlowMeterTab.cs + + + UserControl + + MetrologyDlgLevelMeterTab.cs - + UserControl - + + MetrologyDlgPlatinumResistanceTMeterTab.cs + + + UserControl + + + MetrologyDlgPressMeterTab.cs + + + UserControl + + MetrologyDlgTempMeterTab.cs - + Component - + + Form + + + PathsDlg.cs + + Component - + Component - + Component - + Component - + + Form + + + TransitionsDlg.cs + + + Component + + + Component + + UserControl - + + CameraPictureCtrl.cs + + + UserControl + + + CameraPictureCtrl2.cs + + + UserControl + + + CameraPictureCtrl3.cs + + + UserControl + + + CameraPictureFullCtrl.cs + + + + UserControl + + + PicturesTabPageCtrl.cs + + + + UserControl + + + GraphsTabPageCtrl.cs + + + Form + + + AboutDlg.cs + + + UserControl + + + LogsTabPageCtrl.cs + + + Form + + + MainWnd.cs + + + Form + + + ProcedureDlg.cs + + + UserControl + + ProcedureParamsCtrl.cs - + Component - + + Form + + + ProceduresDlg.cs + + UserControl - - SharedButtons.cs - - - UserControl - - + TestParamsCtrl.cs - + + + FlowSelection.cs + + + + HeatMetersSelection.cs + + + + MethodSelection.cs + + + + PressureSelection.cs + + + + Roi1.cs + + + + Roi2.cs + + + + Roi3.cs + + + + + VolumeAndErrorSelection.cs + + UserControl - + + ProcessTabPageCtrl24.cs + + + UserControl + + + ProcessTabPageCtrl48.cs + + + UserControl + + + ProcessTabPageCtrl6.cs + + + UserControl + + + ProcessTabPageExCtrl.cs + + + UserControl + + + PreviousResultCtrl.cs + + + + Form + + + PreviousResultsDlg.cs + + + Form + + + ResultsArrangementDlg.cs + + + UserControl + + + ResultsTabPageCtrl.cs + + + Form + + + BenchesDlg.cs + + + Form + + + DatabaseSettingsDlg.cs + + + Form + + + LanguageDlg.cs + + + Form + + + UpgradeSelectionDlg.cs + + + Component + + + UserControl + + + BenchControlPanel.cs + + + Form + + + ClosingTbfForm.cs + + + Form + + + EmergencyStopForm.cs + + + Form + + + ErrorDlg.cs + + + + + Form + + + LoginDlgWithBenchSelection.cs + + + Form + + + ModelessActivityForm.cs + + + Form + + + NoBenchOrDatabaseDlg.cs + + + Form + + + PrintOrderForm.cs + + + Form + + + RemarkDlg.cs + + + UserControl + + + SharedButtons.cs + + + Form + + + TabNameDlg.cs + + + UserControl + + TestProgressCtrl.cs - - Component - - - Component - + AmbientCfgCtrl.cs @@ -2383,6 +2358,9 @@ ComponentCfgCtrl.cs + + ComponentParametersDlg.cs + TestMethodCfgCtrl.cs @@ -2965,93 +2943,6 @@ WaterMeterCfgCtrl.cs - - BenchesDlg.cs - - - BenchesDlg.cs - - - ComponentsManagerDlg.cs - - - ComponentsManagerDlg.cs - - - AboutDlg.cs - - - AboutDlg.cs - - - ClosingTbfForm.cs - - - DatabaseSettingsDlg.cs - - - EmergencyStopForm.cs - - - LoginDlgWithBenchSelection.cs - - - ModelessActivityForm.cs - - - PreviousResultCtrl.cs - - - PreviousResultsDlg.cs - - - PrintOrderForm.cs - - - RemarkDlg.cs - - - ResultsArrangementDlg.cs - - - TabNameDlg.cs - - - UpgradeSelectionDlg.cs - - - MainWnd.cs - - - MainWnd.cs - - - MainWnd.cs - - - MainWnd.cs - - - MainWnd.cs - - - PathsDlg.cs - - - PathsDlg.cs - - - PreferencesDlg.cs - - - PreferencesDlg.cs - - - ProcedureDlg.cs - - - ProcedureDlg.cs - ResXFileCodeGenerator Designer @@ -3074,74 +2965,9 @@ ResXFileCodeGenerator Strings.zh-CN.Designer.cs - - GraphsTabPageCtrl.cs - - - PicturesTabPageCtrl.cs - - - ProcessTabPageCtrl24.cs - - - ProcessTabPageCtrl48.cs - - - ProcessTabPageExCtrl.cs - - - SelectComponentClassDlg.cs - - - SelectComponentClassDlg.cs - ControlBoardCfgCtrl.cs - - ComponentParametersDlg.cs - - - ComponentsManagerDlg.cs - - - Designer - AboutDlg.cs - - - Designer - BenchesDlg.cs - - - ErrorDlg.cs - - - NoBenchOrDatabaseDlg.cs - - - MainWnd.cs - Designer - - - MainWnd.cs - Designer - - - MetrologyDlg.cs - - - PathsDlg.cs - - - Designer - PreferencesDlg.cs - - - ProcedureDlg.cs - - - ProceduresDlg.cs - ResXFileCodeGenerator Resources.Designer.cs @@ -3162,124 +2988,211 @@ Strings.Designer.cs Designer - - ProcessTabPageCtrl6.cs + + ComponentsManagerDlg.cs - - LogsTabPageCtrl.cs - - - MeasurementTabPageCtrl.cs - - - ResultsTabPageCtrl.cs - - + SelectComponentClassDlg.cs - - FlowSelection.cs + + MetrologyDlg.cs - - HeatMetersSelection.cs - - - MethodSelection.cs - - - PressureSelection.cs - - - Roi1.cs - - - Roi2.cs - - - Roi3.cs - - - VolumeAndErrorSelection.cs - - - TransitionsDlg.cs - - - TransitionsDlg.cs - - - TransitionsDlg.cs - - - BenchControlPanel.cs - - - BenchControlPanel.cs - - - BenchControlPanel.cs - - - BenchControlPanel.cs - - - BenchControlPanel.cs - - - BenchControlPanel.cs - - - BenchControlPanel.cs - - - CameraPictureCtrl.cs - - - CameraPictureCtrl2.cs - - - CameraPictureCtrl3.cs - - - CameraPictureFullCtrl.cs - - - MetrologyDlgDensityTab.cs - - - MetrologyDlgDiverterTab.cs - - - MetrologyDlgEvaporationTab.cs - - - MetrologyDlgFlowMeterTab.cs - - + MetrologyDlgBalanceTab.cs - - MetrologyDlgPlatinumResistanceTMeterTab.cs + + MetrologyDlgDensityTab.cs - - MetrologyDlgPressMeterTab.cs + + MetrologyDlgDiverterTab.cs - + + MetrologyDlgEvaporationTab.cs + + + MetrologyDlgFlowMeterTab.cs + + MetrologyDlgLevelMeterTab.cs - + + MetrologyDlgPlatinumResistanceTMeterTab.cs + + + MetrologyDlgPressMeterTab.cs + + MetrologyDlgTempMeterTab.cs - + + PathsDlg.cs + + + TransitionsDlg.cs + + + CameraPictureCtrl.cs + + + CameraPictureCtrl2.cs + + + CameraPictureCtrl3.cs + + + CameraPictureFullCtrl.cs + + + PicturesTabPageCtrl.cs + + + GraphsTabPageCtrl.cs + + + AboutDlg.cs + + + LogsTabPageCtrl.cs + + + MainWnd.cs + + + MainWnd.cs + + + MainWnd.cs + + + MainWnd.cs + + + MainWnd.cs + + + MainWnd.cs + + + MainWnd.cs + + + ProcedureDlg.cs + + ProcedureParamsCtrl.cs - - SharedButtons.cs + + ProceduresDlg.cs - + TestParamsCtrl.cs - + + FlowSelection.cs + + + HeatMetersSelection.cs + + + MethodSelection.cs + + + PressureSelection.cs + + + Roi1.cs + + + Roi2.cs + + + Roi3.cs + + + VolumeAndErrorSelection.cs + + + ProcessTabPageCtrl24.cs + + + ProcessTabPageCtrl48.cs + + + ProcessTabPageCtrl6.cs + + + ProcessTabPageExCtrl.cs + + + PreviousResultCtrl.cs + + + PreviousResultsDlg.cs + + + ResultsArrangementDlg.cs + + + ResultsTabPageCtrl.cs + + + BenchesDlg.cs + + + DatabaseSettingsDlg.cs + + + LanguageDlg.cs + + + UpgradeSelectionDlg.cs + + + BenchControlPanel.cs + + + BenchControlPanel.cs + + + BenchControlPanel.cs + + + BenchControlPanel.cs + + + BenchControlPanel.cs + + + ClosingTbfForm.cs + + + EmergencyStopForm.cs + + + ErrorDlg.cs + + + LoginDlgWithBenchSelection.cs + + + ModelessActivityForm.cs + + + NoBenchOrDatabaseDlg.cs + + + PrintOrderForm.cs + + + RemarkDlg.cs + + + SharedButtons.cs + + + TabNameDlg.cs + + TestProgressCtrl.cs @@ -3317,7 +3230,6 @@ Always - diff --git a/TBF/TBF_TemporaryKey.pfx b/TBF/TBF_TemporaryKey.pfx deleted file mode 100644 index e33bf5c91d127ac6332bdf7278b5aa9651466492..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1684 zcmY*YdpMM76n|%YzHu3viN?CbP})TG4b7B{TP_VEDeX!q_sXT!Y_Yk12pJ&}DaNHX zk!x!sl5uTOZeeqoT3IHSm_*xb*-y`I`}CaWocH{G=bZO_|2RJcg;Vf2F$9J8!IE1p zur4gi;0QP_3L8QwtdG%j1Qo0PswDO^go+hlbS~!Eu=KxEL@6Aei{h&h6kmy`z*7Iw z*yXa2M3`o^Ss1=d0goqiLnuDQwd{kJ)f;x*&Bc($hV=_7LBlULMCw9qDE?I_8mASJ-bU86JriEBJ7OOb9MoBF( z#CwMVI%?~yMk9QPe=KXysNcQRb>)5i&i#%PgHrIrM^`4g@@)gwKaoUce`UDM z?#(UkGWz5$unX^+wv#tKuZ4+#ZRJ z{PdBFH-@JPD^HPMQ~BIEUJrgL!ah`)^$!3wAi-s}tMLXw_n}V>en%9_EeoUc!qG{5`iFI-# zC#^Gwf9f!2Lq)FJySJ1}%r`lj(QokHs;R-~`7HAW!E{!(^Ua`4w{@NA^-Cmiu9dCg zcRfP6Ji`diC^1CQJJt)TP@MA7NH3hHKlb$S>t>GcG_!f*@W?CSA6)MO|G`4cCa&kO0tM)wFo%-~iP2tM( zxxSaW!Xr%$T6LKsWchfF9#3y?FSzXz=2-k!&0`s8ZMw~@Ok{J7vr_b)ZUiG@k2|K~zr1<8#eng?Z!rl<^nD-usnp^2YuOwV?)q>$9D2ihQy^os%cwA) z)kdO4^&oOz)?9KO4Tc~b0043RpOmNBsqO>k0UhiDdw?nCbS&zDtw8@XUd?u3HB-#C ze(tdZW>{u{868*xbBxyoGz{&;umuQ1TwqCU7zg3don#!%UeylRf)l_41c5+s26Jz~ z22^kmi>pik@WGH7mWP1T7#E1)AaESZeLqi8f&J&cvl#LOULXil;<+!sC%~9EeKE=t zj|13&J^e-QU&$3-m1|IurqkiZh@n-vMxuBm*AS2a;o80M{AyRIctu9doYe7$cyllD zg5XT_cb4mTsSd4K#}rj(BB2lJS_({$HG%zH&kwaa^Hb(}P%>G4ZkI<(Bl}Qx{M$gM zE{f+f@-d>LOaF=*tXFCL<5E-Sicpjk6_6tL%=*P;-?GGBNvZ8+ct3VgbNQJ({Wb!puCu$1$4DJOM09^SH+s+ycYjDNb%U-K z)W{JkNQ^YG(aZ9R#+O3`j{fCZBc*M0!epp$;lA=PtWlDmP$E^{Hh;NBz*a5!U|n<~ zhH@>ZWo^wgpW7(NGR{pR(9}|2NL$>cag41Rd3; diff --git a/TBF/ComponentsManagerDlg.Designer.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs similarity index 90% rename from TBF/ComponentsManagerDlg.Designer.cs rename to TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs index 2cc2dd265..4c298ee82 100644 --- a/TBF/ComponentsManagerDlg.Designer.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF +namespace TBF.UI.Bench.Components { partial class ComponentsManagerDlg { @@ -33,8 +33,8 @@ namespace TBF { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ComponentsManagerDlg)); this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.listViewEx = new Results.Forms.ListViewEx(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.listViewEx = new global::Results.Forms.ListViewEx(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -68,7 +68,7 @@ namespace TBF this.listViewEx.Name = "listViewEx"; this.listViewEx.UseCompatibleStateImageBehavior = false; this.listViewEx.View = System.Windows.Forms.View.Details; - this.listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(this.listViewEx_SubItemRightClicked); + this.listViewEx.SubItemRightClicked += new global::Results.Forms.SubItemEventHandler(this.listViewEx_SubItemRightClicked); this.listViewEx.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listViewEx_ColumnClick); this.listViewEx.SelectedIndexChanged += new System.EventHandler(this.componentsListView_SelectedIndexChanged); this.listViewEx.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listViewEx_MouseDoubleClick); @@ -96,8 +96,8 @@ namespace TBF #endregion - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.SplitContainer splitContainer; - private UiControls.SharedButtons sharedButtons; + private TBF.UI.Shared.SharedButtons sharedButtons; } } \ No newline at end of file diff --git a/TBF/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs similarity index 97% rename from TBF/ComponentsManagerDlg.cs rename to TBF/UI/Bench/Components/ComponentsManagerDlg.cs index ba09c85f3..485d525a6 100644 --- a/TBF/ComponentsManagerDlg.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs @@ -13,9 +13,9 @@ using Results.Forms; using TBF.BenchControl; using TBF.BenchControl.Generic; using TBF.Resources; -using TBF.UiControls; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI.Bench.Components { public partial class ComponentsManagerDlg : Form, IParentOfListViewEx { @@ -97,7 +97,7 @@ namespace TBF LoadFormPosition(); Text = Strings.Test_Bench_Components_Configuration; - TBF.LocalSettings ls = Program.LocalSettings; + LocalSettings ls = Program.LocalSettings; listViewEx.Columns.Add(Strings.Nr, (ls.ComponentsColumnCount > 0) ? ls.ComponentsColumnWidths[0] : 40); listViewEx.Columns.Add(Strings.Name, (ls.ComponentsColumnCount > 1) ? ls.ComponentsColumnWidths[1] : 80); listViewEx.Columns.Add(Strings.Type, (ls.ComponentsColumnCount > 2) ? ls.ComponentsColumnWidths[2] : 120); @@ -115,10 +115,10 @@ namespace TBF for (LogLevel level = 0; level < LogLevel.Count; level++) logCB.Items.Add(level.ToDescription()); splitContainer.Panel1.Controls.Add(logCB); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); - sharedButtons.DisableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit); + sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit); session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config); cmpntEntities = session.QueryOver() @@ -128,7 +128,7 @@ namespace TBF RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == (int)Column.DebugMode) { @@ -192,7 +192,7 @@ namespace TBF } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { Component cmpnt = (Component)e.Item.Tag; @@ -302,7 +302,7 @@ namespace TBF private void LoadFormPosition() { - TBF.LocalSettings ls = Program.LocalSettings; + LocalSettings ls = Program.LocalSettings; Width = (ls.ComponentsDlgWidth > 0) ? ls.ComponentsDlgWidth : 850; Height = (ls.ComponentsDlgHeight > 0) ? ls.ComponentsDlgHeight : 500; Left = (ls.ComponentsDlgLeft != 0) ? ls.ComponentsDlgLeft : 200; @@ -639,11 +639,11 @@ namespace TBF { if (listViewEx.SelectedIndices.Count == 1) { - sharedButtons.EnableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit); + sharedButtons.EnableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit); } else { - sharedButtons.DisableButtons(UiControls.SharedButtons.Buttons.Remove | UiControls.SharedButtons.Buttons.Edit); + sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit); } } diff --git a/TBF/ComponentsManagerDlg.resx b/TBF/UI/Bench/Components/ComponentsManagerDlg.resx similarity index 100% rename from TBF/ComponentsManagerDlg.resx rename to TBF/UI/Bench/Components/ComponentsManagerDlg.resx diff --git a/TBF/SelectComponentClassDlg.Designer.cs b/TBF/UI/Bench/Components/SelectComponentClassDlg.Designer.cs similarity index 97% rename from TBF/SelectComponentClassDlg.Designer.cs rename to TBF/UI/Bench/Components/SelectComponentClassDlg.Designer.cs index f6804b1d1..19284c768 100644 --- a/TBF/SelectComponentClassDlg.Designer.cs +++ b/TBF/UI/Bench/Components/SelectComponentClassDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF +namespace TBF.UI.Bench.Components { partial class SelectComponentClassDlg { diff --git a/TBF/SelectComponentClassDlg.cs b/TBF/UI/Bench/Components/SelectComponentClassDlg.cs similarity index 96% rename from TBF/SelectComponentClassDlg.cs rename to TBF/UI/Bench/Components/SelectComponentClassDlg.cs index b8b6ba8d6..191287a45 100644 --- a/TBF/SelectComponentClassDlg.cs +++ b/TBF/UI/Bench/Components/SelectComponentClassDlg.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Windows.Forms; using TBF.BenchControl.Generic; using TBF.Resources; -namespace TBF +namespace TBF.UI.Bench.Components { public partial class SelectComponentClassDlg : Form { diff --git a/TBF/SelectComponentClassDlg.resx b/TBF/UI/Bench/Components/SelectComponentClassDlg.resx similarity index 100% rename from TBF/SelectComponentClassDlg.resx rename to TBF/UI/Bench/Components/SelectComponentClassDlg.resx diff --git a/TBF/UiControls/IMetrologyDlgTab.cs b/TBF/UI/Bench/Metrology/IMetrologyDlgTab.cs similarity index 55% rename from TBF/UiControls/IMetrologyDlgTab.cs rename to TBF/UI/Bench/Metrology/IMetrologyDlgTab.cs index 50732863b..8bf65af15 100644 --- a/TBF/UiControls/IMetrologyDlgTab.cs +++ b/TBF/UI/Bench/Metrology/IMetrologyDlgTab.cs @@ -1,21 +1,22 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System.Collections.Generic; +using Config.Entities; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { - interface IMetrologyDlgTab : ITabWithListViewEx + interface IMetrologyDlgTab : TBF.UI.Shared.ITabWithListViewEx { /// /// Component entity that has a list of 'measurement-correction' pairs /// to be updated in the database on OK. /// - Config.Entities.Component MeterEntity { get; set; } + Component MeterEntity { get; set; } /// /// A list of 'measurement-correction' pairs to be deleted from the database on OK. /// - IList ToBeRemoved { get; set; } + IList ToBeRemoved { get; set; } } } diff --git a/TBF/MetrologyDlg.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlg.Designer.cs similarity index 95% rename from TBF/MetrologyDlg.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlg.Designer.cs index f9de32246..b4cc7be62 100644 --- a/TBF/MetrologyDlg.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlg.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlg { @@ -33,7 +33,7 @@ namespace TBF { this.splitContainer = new System.Windows.Forms.SplitContainer(); this.metrologyTabControl = new System.Windows.Forms.TabControl(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -98,6 +98,6 @@ namespace TBF private System.Windows.Forms.SplitContainer splitContainer; private System.Windows.Forms.TabControl metrologyTabControl; - private UiControls.SharedButtons sharedButtons; + private TBF.UI.Shared.SharedButtons sharedButtons; } } \ No newline at end of file diff --git a/TBF/MetrologyDlg.cs b/TBF/UI/Bench/Metrology/MetrologyDlg.cs similarity index 99% rename from TBF/MetrologyDlg.cs rename to TBF/UI/Bench/Metrology/MetrologyDlg.cs index 03d88a5fd..e91f6ba5d 100644 --- a/TBF/MetrologyDlg.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlg.cs @@ -7,11 +7,11 @@ using System.Windows.Forms; using NHibernate; using log4net; using Config.Entities; -using TBF.UiControls; using TBF.BenchControl; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlg : Form, IParentOfListViewEx { diff --git a/TBF/MetrologyDlg.resx b/TBF/UI/Bench/Metrology/MetrologyDlg.resx similarity index 100% rename from TBF/MetrologyDlg.resx rename to TBF/UI/Bench/Metrology/MetrologyDlg.resx diff --git a/TBF/UiControls/MetrologyDlgBalanceTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs similarity index 98% rename from TBF/UiControls/MetrologyDlgBalanceTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs index e2b991d5c..c6fa9ba87 100644 --- a/TBF/UiControls/MetrologyDlgBalanceTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgBalanceTab { @@ -57,7 +57,7 @@ namespace TBF.UiControls this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -369,7 +369,7 @@ namespace TBF.UiControls private System.Windows.Forms.Label cmpntNameLabel; private System.Windows.Forms.SplitContainer splitContainer1; - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.Label measuredLabel; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; diff --git a/TBF/UiControls/MetrologyDlgBalanceTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs similarity index 96% rename from TBF/UiControls/MetrologyDlgBalanceTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs index 1438c1265..59d694d4e 100644 --- a/TBF/UiControls/MetrologyDlgBalanceTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.cs @@ -7,9 +7,11 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgBalanceTab : UserControl, IMetrologyDlgTab { @@ -72,8 +74,8 @@ namespace TBF.UiControls this.Controls.Add(correctionTextBox = new TextBox()); this.Controls.Add(errorTextBox = new TextBox()); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [kg]", Strings.Mass), Width = 100 }); @@ -143,7 +145,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -159,7 +161,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TBF/UiControls/MetrologyDlgBalanceTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgBalanceTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgBalanceTab.resx diff --git a/TBF/UiControls/MetrologyDlgDensityTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.Designer.cs similarity index 98% rename from TBF/UiControls/MetrologyDlgDensityTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.Designer.cs index dada06996..c3b9c4fd1 100644 --- a/TBF/UiControls/MetrologyDlgDensityTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgDensityTab { diff --git a/TBF/UiControls/MetrologyDlgDensityTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs similarity index 97% rename from TBF/UiControls/MetrologyDlgDensityTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs index 91a078047..78166b680 100644 --- a/TBF/UiControls/MetrologyDlgDensityTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -9,7 +9,7 @@ using log4net; using Config.Entities; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgDensityTab : UserControl, IMetrologyDlgTab { diff --git a/TBF/UiControls/MetrologyDlgDensityTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgDensityTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.resx diff --git a/TBF/UiControls/MetrologyDlgDiverterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs similarity index 98% rename from TBF/UiControls/MetrologyDlgDiverterTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs index 85f1272c5..de0e064a5 100644 --- a/TBF/UiControls/MetrologyDlgDiverterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2019 Sensus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgDiverterTab { @@ -48,7 +48,7 @@ namespace TBF.UiControls this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -270,7 +270,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UiControls/MetrologyDlgDiverterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs similarity index 94% rename from TBF/UiControls/MetrologyDlgDiverterTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs index d26ae9722..c55a44d5a 100644 --- a/TBF/UiControls/MetrologyDlgDiverterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.cs @@ -7,9 +7,11 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgDiverterTab : UserControl, IMetrologyDlgTab { @@ -75,9 +77,9 @@ namespace TBF.UiControls this.Controls.Add(measurementTextBox); this.Controls.Add(correctionTextBox); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [m3/h]", Strings.Flow), Width = 100 }); @@ -126,7 +128,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -138,7 +140,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return; @@ -166,7 +168,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TBF/UiControls/MetrologyDlgDiverterTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgDiverterTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgDiverterTab.resx diff --git a/TBF/UiControls/MetrologyDlgEvaporationTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs similarity index 98% rename from TBF/UiControls/MetrologyDlgEvaporationTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs index 101460e7c..e59be1910 100644 --- a/TBF/UiControls/MetrologyDlgEvaporationTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2019 Sensus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgEvaporationTab { @@ -48,7 +48,7 @@ namespace TBF.UiControls this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -270,7 +270,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UiControls/MetrologyDlgEvaporationTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs similarity index 94% rename from TBF/UiControls/MetrologyDlgEvaporationTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs index d2bca014c..841c8d0f3 100644 --- a/TBF/UiControls/MetrologyDlgEvaporationTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.cs @@ -7,9 +7,11 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgEvaporationTab : UserControl, IMetrologyDlgTab { @@ -75,9 +77,9 @@ namespace TBF.UiControls this.Controls.Add(measurementTextBox); this.Controls.Add(correctionTextBox); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [°C]", Strings.Temperature), Width = 100 }); @@ -126,7 +128,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -138,7 +140,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return; @@ -166,7 +168,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TBF/UiControls/MetrologyDlgEvaporationTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgEvaporationTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgEvaporationTab.resx diff --git a/TBF/UiControls/MetrologyDlgFlowMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs similarity index 98% rename from TBF/UiControls/MetrologyDlgFlowMeterTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs index cfc506eb6..77ce22917 100644 --- a/TBF/UiControls/MetrologyDlgFlowMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgFlowMeterTab { @@ -48,7 +48,7 @@ namespace TBF.UiControls this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -270,7 +270,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UiControls/MetrologyDlgFlowMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs similarity index 96% rename from TBF/UiControls/MetrologyDlgFlowMeterTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs index 28473c234..989991223 100644 --- a/TBF/UiControls/MetrologyDlgFlowMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.cs @@ -7,9 +7,11 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgFlowMeterTab : UserControl, IMetrologyDlgTab { @@ -89,8 +91,8 @@ namespace TBF.UiControls this.Controls.Add(correctionTextBox = new TextBox()); this.Controls.Add(errorTextBox = new TextBox()); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [m3/h]", Strings.Flow), Width = 100 }); @@ -151,7 +153,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -167,7 +169,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TBF/UiControls/MetrologyDlgFlowMeterTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgFlowMeterTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgFlowMeterTab.resx diff --git a/TBF/UiControls/MetrologyDlgLevelMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs similarity index 98% rename from TBF/UiControls/MetrologyDlgLevelMeterTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs index 87fcd4d7c..a8b3d722f 100644 --- a/TBF/UiControls/MetrologyDlgLevelMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2018 Sensus Metering Systems +/// Copyright (c) 2018 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgLevelMeterTab { @@ -48,7 +48,7 @@ namespace TBF.UiControls this.measuredTextBox = new System.Windows.Forms.TextBox(); this.correctedLabel = new System.Windows.Forms.Label(); this.measuredLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -270,7 +270,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UiControls/MetrologyDlgLevelMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs similarity index 94% rename from TBF/UiControls/MetrologyDlgLevelMeterTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs index 3a283bc14..6c4ecc7b2 100644 --- a/TBF/UiControls/MetrologyDlgLevelMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.cs @@ -7,9 +7,11 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgLevelMeterTab : UserControl, IMetrologyDlgTab { @@ -75,9 +77,9 @@ namespace TBF.UiControls this.Controls.Add(measurementTextBox); this.Controls.Add(correctionTextBox); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [mm]", Strings.Level), Width = 100 }); @@ -126,7 +128,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -138,7 +140,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem < 1 || e.SubItem > 2) return; @@ -166,7 +168,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TBF/UiControls/MetrologyDlgLevelMeterTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgLevelMeterTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgLevelMeterTab.resx diff --git a/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs similarity index 99% rename from TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs index f6ebb6157..d0771dc7d 100644 --- a/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgPlatinumResistanceTMeterTab { diff --git a/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.cs similarity index 99% rename from TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.cs index 1fccacd98..4be2c49de 100644 --- a/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2016 Sensus Metering Systems +/// Copyright (c) 2016 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -9,7 +9,7 @@ using log4net; using Config.Entities; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgPlatinumResistanceTMeterTab : UserControl, IMetrologyDlgTab { diff --git a/TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgPlatinumResistanceTMeterTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgPlatinumResistanceTMeterTab.resx diff --git a/TBF/UiControls/MetrologyDlgPressMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs similarity index 96% rename from TBF/UiControls/MetrologyDlgPressMeterTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs index e9e82a65f..fb5804f39 100644 --- a/TBF/UiControls/MetrologyDlgPressMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgPressMeterTab { @@ -39,7 +39,7 @@ namespace TBF.UiControls this.measuredLabel = new System.Windows.Forms.Label(); this.componentLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -172,7 +172,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label componentLabel; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UiControls/MetrologyDlgPressMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs similarity index 95% rename from TBF/UiControls/MetrologyDlgPressMeterTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs index cc80e6648..5f4e95d24 100644 --- a/TBF/UiControls/MetrologyDlgPressMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.cs @@ -7,9 +7,11 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgPressMeterTab : UserControl, IMetrologyDlgTab { @@ -69,8 +71,8 @@ namespace TBF.UiControls this.Controls.Add(correctionTextBox = new TextBox()); this.Controls.Add(errorTextBox = new TextBox()); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 60 }); listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [bar]", Strings.Pressure), Width = 100 }); @@ -107,7 +109,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -123,7 +125,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TBF/UiControls/MetrologyDlgPressMeterTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgPressMeterTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgPressMeterTab.resx diff --git a/TBF/UiControls/MetrologyDlgTempMeterTab.Designer.cs b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs similarity index 97% rename from TBF/UiControls/MetrologyDlgTempMeterTab.Designer.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs index 663753e65..21ce33396 100644 --- a/TBF/UiControls/MetrologyDlgTempMeterTab.Designer.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { partial class MetrologyDlgTempMeterTab { @@ -39,7 +39,7 @@ namespace TBF.UiControls this.measuredLabel = new System.Windows.Forms.Label(); this.componentLabel = new System.Windows.Forms.Label(); this.cmpntNameLabel = new System.Windows.Forms.Label(); - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -172,7 +172,7 @@ namespace TBF.UiControls private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.Label componentLabel; private System.Windows.Forms.Label cmpntNameLabel; - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; private System.Windows.Forms.GroupBox testGroupBox; private System.Windows.Forms.TextBox correctedTextBox; private System.Windows.Forms.TextBox measuredTextBox; diff --git a/TBF/UiControls/MetrologyDlgTempMeterTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs similarity index 95% rename from TBF/UiControls/MetrologyDlgTempMeterTab.cs rename to TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs index 5c3db9ef4..9ef457e1d 100644 --- a/TBF/UiControls/MetrologyDlgTempMeterTab.cs +++ b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.cs @@ -7,9 +7,11 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Metrology { public partial class MetrologyDlgTempMeterTab : UserControl, IMetrologyDlgTab { @@ -69,8 +71,8 @@ namespace TBF.UiControls this.Controls.Add(correctionTextBox = new TextBox()); this.Controls.Add(errorTextBox = new TextBox()); - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); listViewEx.Columns.Add(new ColumnHeader() { Text = Strings.Nr, Width = 40 }); listViewEx.Columns.Add(new ColumnHeader() { Text = string.Format("{0} [°C]", Strings.Temperature), Width = 120 }); @@ -107,7 +109,7 @@ namespace TBF.UiControls listViewEx.Items.Add(lvi); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && e.SubItem == 1) { @@ -123,7 +125,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (ParseItem(e.Item, e.SubItem, e.DisplayText)) return; diff --git a/TBF/UiControls/MetrologyDlgTempMeterTab.resx b/TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.resx similarity index 100% rename from TBF/UiControls/MetrologyDlgTempMeterTab.resx rename to TBF/UI/Bench/Metrology/MetrologyDlgTempMeterTab.resx diff --git a/TBF/UiControls/PathsBenchCtrl.cs b/TBF/UI/Bench/Paths/PathsBenchCtrl.cs similarity index 86% rename from TBF/UiControls/PathsBenchCtrl.cs rename to TBF/UI/Bench/Paths/PathsBenchCtrl.cs index 481e9c2fb..8a58bf979 100644 --- a/TBF/UiControls/PathsBenchCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsBenchCtrl.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -7,14 +7,16 @@ using System.Drawing; using System.Globalization; using System.Windows.Forms; using log4net; +using NHibernate; +using Results.Forms; using TBF.BenchControl; using TBF.BenchControl.GenericDevices; using TBF.Resources; -using NHibernate; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Paths { - public class PathsBenchCtrl : BaseWithListViewEx, ITabWithListViewEx + public class PathsBenchCtrl : BaseWithListViewEx, ITabWithListViewEx { static readonly ILog log = LogManager.GetLogger(typeof(PathsBenchCtrl)); @@ -58,27 +60,27 @@ namespace TBF.UiControls foreach (var path in MyItems) path.OriName = path.Name; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; - Columns.Add(Strings.Name, (ls.BenchColumnCount > 0) ? ls.BenchColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_from_m3h, (ls.BenchColumnCount > 1) ? ls.BenchColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_to_m3h, (ls.BenchColumnCount > 2) ? ls.BenchColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.T_in, (ls.BenchColumnCount > 3) ? ls.BenchColumnWidths[3] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.T_out, (ls.BenchColumnCount > 4) ? ls.BenchColumnWidths[4] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.P_in, (ls.BenchColumnCount > 5) ? ls.BenchColumnWidths[5] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.P_out, (ls.BenchColumnCount > 6) ? ls.BenchColumnWidths[6] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.P_delta, (ls.BenchColumnCount > 7) ? ls.BenchColumnWidths[7] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.StopBFValve_chdr, (ls.BenchColumnCount > 8) ? ls.BenchColumnWidths[8] : 70 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Name, (ls.BenchColumnCount > 0) ? ls.BenchColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Q_from_m3h, (ls.BenchColumnCount > 1) ? ls.BenchColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Q_to_m3h, (ls.BenchColumnCount > 2) ? ls.BenchColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.T_in, (ls.BenchColumnCount > 3) ? ls.BenchColumnWidths[3] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.T_out, (ls.BenchColumnCount > 4) ? ls.BenchColumnWidths[4] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.P_in, (ls.BenchColumnCount > 5) ? ls.BenchColumnWidths[5] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.P_out, (ls.BenchColumnCount > 6) ? ls.BenchColumnWidths[6] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.P_delta, (ls.BenchColumnCount > 7) ? ls.BenchColumnWidths[7] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.StopBFValve_chdr, (ls.BenchColumnCount > 8) ? ls.BenchColumnWidths[8] : 70 * parent.Dpi / Constants.Dpi100pct); int clmn = (int)Column.FixedColumnsCount; foreach (var vlv in parent.Valves) { if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Bench) { - Columns.Add(vlv.Cfg.Name, (ls.BenchColumnCount > clmn) ? ls.BenchColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(vlv.Cfg.Name, (ls.BenchColumnCount > clmn) ? ls.BenchColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); clmn++; } } @@ -140,7 +142,7 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is Config.Entities.IHasItemNr) && @@ -152,7 +154,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -178,7 +180,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem >= fixedColumnsCount) { diff --git a/TBF/PathsDlg.Designer.cs b/TBF/UI/Bench/Paths/PathsDlg.Designer.cs similarity index 92% rename from TBF/PathsDlg.Designer.cs rename to TBF/UI/Bench/Paths/PathsDlg.Designer.cs index e78a271ab..6b862410f 100644 --- a/TBF/PathsDlg.Designer.cs +++ b/TBF/UI/Bench/Paths/PathsDlg.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF +namespace TBF.UI.Bench.Paths { partial class PathsDlg { @@ -35,14 +35,14 @@ namespace TBF this.splitContainer = new System.Windows.Forms.SplitContainer(); this.pathsTabControl = new System.Windows.Forms.TabControl(); this.feedingTabPage = new System.Windows.Forms.TabPage(); - this.pathsFeedingCtrl = new TBF.UiControls.PathsFeedingCtrl(); + this.pathsFeedingCtrl = new TBF.UI.Bench.Paths.PathsFeedingCtrl(); this.benchTabPage = new System.Windows.Forms.TabPage(); - this.pathsBenchCtrl = new TBF.UiControls.PathsBenchCtrl(); + this.pathsBenchCtrl = new TBF.UI.Bench.Paths.PathsBenchCtrl(); this.outputTabPage = new System.Windows.Forms.TabPage(); - this.pathsOutputCtrl = new TBF.UiControls.PathsOutputCtrl(); + this.pathsOutputCtrl = new TBF.UI.Bench.Paths.PathsOutputCtrl(); this.metersTabPage = new System.Windows.Forms.TabPage(); - this.pathsMetersCtrl = new TBF.UiControls.PathsMetersCtrl(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.pathsMetersCtrl = new TBF.UI.Bench.Paths.PathsMetersCtrl(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -184,10 +184,10 @@ namespace TBF private System.Windows.Forms.TabPage benchTabPage; private System.Windows.Forms.TabPage outputTabPage; private System.Windows.Forms.TabPage metersTabPage; - private UiControls.SharedButtons sharedButtons; - private UiControls.PathsFeedingCtrl pathsFeedingCtrl; - private UiControls.PathsBenchCtrl pathsBenchCtrl; - private UiControls.PathsOutputCtrl pathsOutputCtrl; - private UiControls.PathsMetersCtrl pathsMetersCtrl; + private TBF.UI.Shared.SharedButtons sharedButtons; + private PathsFeedingCtrl pathsFeedingCtrl; + private PathsBenchCtrl pathsBenchCtrl; + private PathsOutputCtrl pathsOutputCtrl; + private PathsMetersCtrl pathsMetersCtrl; } } \ No newline at end of file diff --git a/TBF/PathsDlg.cs b/TBF/UI/Bench/Paths/PathsDlg.cs similarity index 98% rename from TBF/PathsDlg.cs rename to TBF/UI/Bench/Paths/PathsDlg.cs index e6db1485f..5d465f169 100644 --- a/TBF/PathsDlg.cs +++ b/TBF/UI/Bench/Paths/PathsDlg.cs @@ -8,11 +8,12 @@ using System.Windows.Forms; using NHibernate; using log4net; using Config.Entities; -using TBF.UiControls; +using Results.Forms; using TBF.BenchControl.GenericDevices; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI.Bench.Paths { public partial class PathsDlg : Form, IParentOfListViewEx { @@ -29,7 +30,6 @@ namespace TBF /// Used when re-scaling the dialog: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi public readonly int Dpi; - public const int Dpi100pct = 96; public IList TbfComponents; public IList Valves; @@ -302,7 +302,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; + ListViewEx listViewEx = sender as ListViewEx; if (listViewEx.SelectedItems.Count != 1) { /// No item selected diff --git a/TBF/PathsDlg.resx b/TBF/UI/Bench/Paths/PathsDlg.resx similarity index 100% rename from TBF/PathsDlg.resx rename to TBF/UI/Bench/Paths/PathsDlg.resx diff --git a/TBF/UiControls/PathsFeedingCtrl.cs b/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs similarity index 91% rename from TBF/UiControls/PathsFeedingCtrl.cs rename to TBF/UI/Bench/Paths/PathsFeedingCtrl.cs index e05fdbfe9..0fc318ca2 100644 --- a/TBF/UiControls/PathsFeedingCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsFeedingCtrl.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -8,10 +8,12 @@ using System.Globalization; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.BenchControl.GenericDevices; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Paths { public class PathsFeedingCtrl : BaseWithListViewEx, ITabWithListViewEx { @@ -54,21 +56,21 @@ namespace TBF.UiControls foreach (var path in MyItems) path.OriName = path.Name; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; - Columns.Add(Strings.Name, (ls.FeedingColumnCount > 0) ? ls.FeedingColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_from_m3h, (ls.FeedingColumnCount > 1) ? ls.FeedingColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_to_m3h, (ls.FeedingColumnCount > 2) ? ls.FeedingColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Pump, (ls.FeedingColumnCount > 3) ? ls.FeedingColumnWidths[3] : 60 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Name, (ls.FeedingColumnCount > 0) ? ls.FeedingColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Q_from_m3h, (ls.FeedingColumnCount > 1) ? ls.FeedingColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Q_to_m3h, (ls.FeedingColumnCount > 2) ? ls.FeedingColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Pump, (ls.FeedingColumnCount > 3) ? ls.FeedingColumnWidths[3] : 60 * parent.Dpi / Constants.Dpi100pct); int clmn = (int)Column.FixedColumnsCount; foreach (var rv in parent.FeedingRegulValves) { - Columns.Add(rv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(rv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); clmn++; } regvCount = clmn - (int)Column.FixedColumnsCount; @@ -77,7 +79,7 @@ namespace TBF.UiControls { if (vlv.Category == TBF.BenchControl.ValveCategory.All || vlv.Category == TBF.BenchControl.ValveCategory.Feeding) { - Columns.Add(vlv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(vlv.Cfg.Name, (ls.FeedingColumnCount > clmn) ? ls.FeedingColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); clmn++; } } @@ -128,7 +130,7 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is IHasItemNr) && @@ -140,7 +142,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -166,7 +168,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem >= fixedColumnsCount + regvCount) { diff --git a/TBF/UiControls/PathsHeatMetersCtrl.cs b/TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs similarity index 95% rename from TBF/UiControls/PathsHeatMetersCtrl.cs rename to TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs index 2c874fd78..96e3a9880 100644 --- a/TBF/UiControls/PathsHeatMetersCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsHeatMetersCtrl.cs @@ -1,16 +1,18 @@ /// -/// Copyright (c) 2016-2017 Sensus Metering Systems +/// Copyright (c) 2016-2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Globalization; using System.Windows.Forms; using log4net; +using Results.Forms; using TBF.BenchControl; using TBF.BenchControl.GenericDevices; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Paths { public class PathsHeatMetersCtrl : BaseWithListViewEx, ITabWithListViewEx { @@ -60,9 +62,9 @@ namespace TBF.UiControls foreach (var path in MyItems) path.OriName = path.Name; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); IList tempMeters = new List(); foreach (var cmpnt in parent.TbfComponents) @@ -119,7 +121,7 @@ namespace TBF.UiControls #endif } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is Config.Entities.IHasItemNr) && @@ -131,7 +133,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -157,7 +159,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem >= (int)Column.TWarmFrom && e.SubItem <= (int)Column.TColdTo) { diff --git a/TBF/UiControls/PathsMetersCtrl.cs b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs similarity index 90% rename from TBF/UiControls/PathsMetersCtrl.cs rename to TBF/UI/Bench/Paths/PathsMetersCtrl.cs index 34c805acf..a86994bbf 100644 --- a/TBF/UiControls/PathsMetersCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsMetersCtrl.cs @@ -1,16 +1,19 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Globalization; using System.Windows.Forms; using log4net; +using Results.Forms; using TBF.BenchControl; using TBF.BenchControl.GenericDevices; using TBF.Resources; +using TBF.UI.Bench.Paths; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Paths { public class PathsMetersCtrl : BaseWithListViewEx, ITabWithListViewEx { @@ -26,7 +29,7 @@ namespace TBF.UiControls } readonly int fixedColumnsCount = (int)Column.FixedColumnsCount; - PathsDlg parent; + PathsDlg parent; Control parentControl; Control[] editors; @@ -47,9 +50,9 @@ namespace TBF.UiControls foreach (var path in MyItems) path.OriName = path.Name; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); IList readers = new List(); foreach (var cmpnt in parent.TbfComponents) @@ -59,11 +62,11 @@ namespace TBF.UiControls /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; - Columns.Add(Strings.Name, (ls.MetersColumnCount > 0) ? ls.MetersColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Name, (ls.MetersColumnCount > 0) ? ls.MetersColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct); int clmn = (int)Column.FixedColumnsCount; for (int i = 0; i < Config.Data.WMsCount; i++) { - Columns.Add(string.Format("{0} {1}", Strings.Sensor, i + 1), (ls.MetersColumnCount > clmn) ? ls.MetersColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(string.Format("{0} {1}", Strings.Sensor, i + 1), (ls.MetersColumnCount > clmn) ? ls.MetersColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); clmn++; } @@ -88,13 +91,13 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -120,7 +123,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { } diff --git a/TBF/UiControls/PathsOutputCtrl.cs b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs similarity index 85% rename from TBF/UiControls/PathsOutputCtrl.cs rename to TBF/UI/Bench/Paths/PathsOutputCtrl.cs index 1f387b446..2e3a00d1e 100644 --- a/TBF/UiControls/PathsOutputCtrl.cs +++ b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs @@ -1,17 +1,19 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Slovensko a.s. /// using System; +using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.BenchControl; using TBF.BenchControl.GenericDevices; using TBF.Resources; -using System.Collections.Generic; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Paths { public class PathsOutputCtrl : BaseWithListViewEx, ITabWithListViewEx { @@ -65,35 +67,35 @@ namespace TBF.UiControls foreach (var path in MyItems) path.OriName = path.Name; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; - Columns.Add(Strings.Name, (ls.OutputColumnCount > 0) ? ls.OutputColumnWidths[0] : 60 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_from_m3h, (ls.OutputColumnCount > 1) ? ls.OutputColumnWidths[1] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Q_to_m3h, (ls.OutputColumnCount > 2) ? ls.OutputColumnWidths[2] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Flowmeter, (ls.OutputColumnCount > 3) ? ls.OutputColumnWidths[3] : 85 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Reg_valve, (ls.OutputColumnCount > 4) ? ls.OutputColumnWidths[4] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.PID, (ls.OutputColumnCount > 5) ? ls.OutputColumnWidths[5] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Diverter, (ls.OutputColumnCount > 6) ? ls.OutputColumnWidths[6] : 60 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.T_div, (ls.OutputColumnCount > 7) ? ls.OutputColumnWidths[7] : 70 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Balance, (ls.OutputColumnCount > 8) ? ls.OutputColumnWidths[8] : 50 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("{0} 1", Strings.StartValve), (ls.OutputColumnCount > 9) ? ls.OutputColumnWidths[9] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("Inv. SV1"), (ls.OutputColumnCount > 10) ? ls.OutputColumnWidths[10] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("{0} 2", Strings.StartValve), (ls.OutputColumnCount > 11) ? ls.OutputColumnWidths[11] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("Inv.SV2"), (ls.OutputColumnCount > 12) ? ls.OutputColumnWidths[12] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("Lag SV2"), (ls.OutputColumnCount > 13) ? ls.OutputColumnWidths[13] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("{0} 3", Strings.StartValve), (ls.OutputColumnCount > 14) ? ls.OutputColumnWidths[14] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("Inv.SV3"), (ls.OutputColumnCount > 15) ? ls.OutputColumnWidths[15] : 80 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(string.Format("Lag SV3"), (ls.OutputColumnCount > 16) ? ls.OutputColumnWidths[16] : 80 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Name, (ls.OutputColumnCount > 0) ? ls.OutputColumnWidths[0] : 60 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Q_from_m3h, (ls.OutputColumnCount > 1) ? ls.OutputColumnWidths[1] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Q_to_m3h, (ls.OutputColumnCount > 2) ? ls.OutputColumnWidths[2] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Flowmeter, (ls.OutputColumnCount > 3) ? ls.OutputColumnWidths[3] : 85 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Reg_valve, (ls.OutputColumnCount > 4) ? ls.OutputColumnWidths[4] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.PID, (ls.OutputColumnCount > 5) ? ls.OutputColumnWidths[5] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Diverter, (ls.OutputColumnCount > 6) ? ls.OutputColumnWidths[6] : 60 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.T_div, (ls.OutputColumnCount > 7) ? ls.OutputColumnWidths[7] : 70 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Balance, (ls.OutputColumnCount > 8) ? ls.OutputColumnWidths[8] : 50 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("{0} 1", Strings.StartValve), (ls.OutputColumnCount > 9) ? ls.OutputColumnWidths[9] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("Inv. SV1"), (ls.OutputColumnCount > 10) ? ls.OutputColumnWidths[10] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("{0} 2", Strings.StartValve), (ls.OutputColumnCount > 11) ? ls.OutputColumnWidths[11] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("Inv.SV2"), (ls.OutputColumnCount > 12) ? ls.OutputColumnWidths[12] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("Lag SV2"), (ls.OutputColumnCount > 13) ? ls.OutputColumnWidths[13] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("{0} 3", Strings.StartValve), (ls.OutputColumnCount > 14) ? ls.OutputColumnWidths[14] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("Inv.SV3"), (ls.OutputColumnCount > 15) ? ls.OutputColumnWidths[15] : 80 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(string.Format("Lag SV3"), (ls.OutputColumnCount > 16) ? ls.OutputColumnWidths[16] : 80 * parent.Dpi / Constants.Dpi100pct); int clmn = (int)Column.FixedColumnsCount; foreach (var vlv in parent.Valves) { if (vlv.Category == ValveCategory.All || vlv.Category == ValveCategory.Output) { - Columns.Add(vlv.Cfg.Name, (ls.OutputColumnCount > clmn) ? ls.OutputColumnWidths[clmn] : 50 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(vlv.Cfg.Name, (ls.OutputColumnCount > clmn) ? ls.OutputColumnWidths[clmn] : 50 * parent.Dpi / Constants.Dpi100pct); clmn++; } } @@ -179,7 +181,7 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; if ((e.Item.Tag is IHasItemNr) && @@ -191,7 +193,7 @@ namespace TBF.UiControls StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -217,7 +219,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem >= fixedColumnsCount) { diff --git a/TBF/UiControls/TransitionStepsCtrl.cs b/TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs similarity index 93% rename from TBF/UiControls/TransitionStepsCtrl.cs rename to TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs index 85b218774..cd76f7154 100644 --- a/TBF/UiControls/TransitionStepsCtrl.cs +++ b/TBF/UI/Bench/Transitions/TransitionStepsCtrl.cs @@ -1,16 +1,18 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Forms; using TBF.BenchControl; using TBF.BenchControl.GenericDevices; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Transitions { public partial class TransitionStepsCtrl : BaseWithListViewEx, ITabWithListViewEx { @@ -30,7 +32,7 @@ namespace TBF.UiControls TransitionSequence sequence; - TransitionsDlg parent; + TransitionsDlg parent; Control parentControl; Control[] editors; @@ -51,7 +53,7 @@ namespace TBF.UiControls conditionIDs = new List(); } - public void Initialize(TransitionSequence sequence, TransitionsDlg parent, Control parentControl) + public void Initialize(TransitionSequence sequence, TBF.UI.Bench.Transitions.TransitionsDlg parent, Control parentControl) { this.sequence = sequence; this.parent = parent; @@ -59,9 +61,9 @@ namespace TBF.UiControls Name = sequence.Name; MyItems = sequence.TransitionSteps; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); vCount = 0; fmPumpCount = 0; @@ -70,26 +72,26 @@ namespace TBF.UiControls /// /// ListViewEx columns /// - Columns.Add(Strings.Duration_s, 70 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.Message, 100 * parent.Dpi / PathsDlg.Dpi100pct); - Columns.Add(Strings.End_Condition, 80 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Duration_s, 70 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.Message, 100 * parent.Dpi / Constants.Dpi100pct); + Columns.Add(Strings.End_Condition, 80 * parent.Dpi / Constants.Dpi100pct); foreach (var vlv in parent.Valves) { if (vlv is BenchControl.GenericDevices.IPumpFM) { - Columns.Add(vlv.Cfg.Name + " [%]", 45 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(vlv.Cfg.Name + " [%]", 45 * parent.Dpi / Constants.Dpi100pct); fmPumpCount++; } } foreach (var rvlv in parent.RegulValves) { - Columns.Add(rvlv.Cfg.Name + " [%]", 55 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(rvlv.Cfg.Name + " [%]", 55 * parent.Dpi / Constants.Dpi100pct); } foreach (var vlv in parent.Valves) { if (!(vlv is BenchControl.GenericDevices.IPumpFM)) { - Columns.Add(vlv.Cfg.Name, 40 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(vlv.Cfg.Name, 40 * parent.Dpi / Constants.Dpi100pct); vCount++; } } @@ -187,13 +189,13 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -219,7 +221,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == (int)Column.Duration) { diff --git a/TBF/TransitionsDlg.Designer.cs b/TBF/UI/Bench/Transitions/TransitionsDlg.Designer.cs similarity index 95% rename from TBF/TransitionsDlg.Designer.cs rename to TBF/UI/Bench/Transitions/TransitionsDlg.Designer.cs index 3351a8fbf..8bd3acd5d 100644 --- a/TBF/TransitionsDlg.Designer.cs +++ b/TBF/UI/Bench/Transitions/TransitionsDlg.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF +namespace TBF.UI.Bench.Transitions { partial class TransitionsDlg { @@ -34,7 +34,7 @@ namespace TBF System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TransitionsDlg)); this.mainSplitContainer = new System.Windows.Forms.SplitContainer(); this.tabControl = new System.Windows.Forms.TabControl(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); this.mainSplitContainer.Panel1.SuspendLayout(); this.mainSplitContainer.Panel2.SuspendLayout(); @@ -86,6 +86,6 @@ namespace TBF private System.Windows.Forms.SplitContainer mainSplitContainer; private System.Windows.Forms.TabControl tabControl; - private UiControls.SharedButtons sharedButtons; + private TBF.UI.Shared.SharedButtons sharedButtons; } } \ No newline at end of file diff --git a/TBF/TransitionsDlg.cs b/TBF/UI/Bench/Transitions/TransitionsDlg.cs similarity index 98% rename from TBF/TransitionsDlg.cs rename to TBF/UI/Bench/Transitions/TransitionsDlg.cs index 349a2e722..67c02354a 100644 --- a/TBF/TransitionsDlg.cs +++ b/TBF/UI/Bench/Transitions/TransitionsDlg.cs @@ -3,18 +3,19 @@ /// using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Windows.Forms; using log4net; using NHibernate; using Config.Entities; +using Results.Forms; using TBF.BenchControl.Generic; using TBF.BenchControl.GenericDevices; using TBF.Resources; -using TBF.UiControls; -using System.IO; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI.Bench.Transitions { public partial class TransitionsDlg : Form, IParentOfListViewEx { @@ -168,7 +169,7 @@ namespace TBF void RefreshAllTabs() { - foreach (var ctrl in seqStepsCtrls) (ctrl as Results.Forms.ListViewEx).Refresh(); + foreach (var ctrl in seqStepsCtrls) (ctrl as ListViewEx).Refresh(); } private void Unlocked(object sender, EventArgs e) @@ -179,7 +180,7 @@ namespace TBF private void newTabButton_Click(object sender, EventArgs e) { - Forms.TabNameDlg dlg; + TabNameDlg dlg; bool nameUsed; int tabId = TransitionSequences.Count + VirtualBenchSequences.Count; @@ -195,7 +196,7 @@ namespace TBF if (!nameUsed) break; } - dlg = new Forms.TabNameDlg(); + dlg = new TabNameDlg(); dlg.TabNameLabel = Strings.New_transition_name; dlg.TabName = newName; @@ -232,7 +233,7 @@ namespace TBF TransitionSequence transitionSeq = tabPage.Tag as TransitionSequence; VirtualBenchSequence virtualBenchSeq = tabPage.Tag as VirtualBenchSequence; - Forms.TabNameDlg dlg = new Forms.TabNameDlg(true); + TabNameDlg dlg = new TabNameDlg(true); dlg.TabNameLabel = Strings.New_transition_name; if (dlg.ShowDialog() == DialogResult.OK) @@ -622,7 +623,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; + ListViewEx listViewEx = sender as ListViewEx; if (listViewEx.SelectedItems.Count != 1) { UpdateButtonStates(SharedButtons.SelectedItemPos.None); diff --git a/TBF/TransitionsDlg.resx b/TBF/UI/Bench/Transitions/TransitionsDlg.resx similarity index 100% rename from TBF/TransitionsDlg.resx rename to TBF/UI/Bench/Transitions/TransitionsDlg.resx diff --git a/TBF/UiControls/VirtualBenchStepsCtrl.cs b/TBF/UI/Bench/Transitions/VirtualBenchStepsCtrl.cs similarity index 91% rename from TBF/UiControls/VirtualBenchStepsCtrl.cs rename to TBF/UI/Bench/Transitions/VirtualBenchStepsCtrl.cs index a846af34b..0b2c99089 100644 --- a/TBF/UiControls/VirtualBenchStepsCtrl.cs +++ b/TBF/UI/Bench/Transitions/VirtualBenchStepsCtrl.cs @@ -1,16 +1,16 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; -using TBF.BenchControl; -using TBF.BenchControl.GenericDevices; +using Results.Forms; using TBF.Resources; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Bench.Transitions { public partial class VirtualBenchStepsCtrl : BaseWithListViewEx, ITabWithListViewEx { @@ -49,9 +49,9 @@ namespace TBF.UiControls Name = sequence.Name; MyItems = sequence.VirtualBenchSteps; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); vCount = 0; fmPumpCount = 0; @@ -60,7 +60,7 @@ namespace TBF.UiControls /// /// ListViewEx columns /// - Columns.Add(Strings.Duration_s, 70 * parent.Dpi / PathsDlg.Dpi100pct); + Columns.Add(Strings.Duration_s, 70 * parent.Dpi / Constants.Dpi100pct); //foreach (var vlv in parent.Valves) //{ // if (vlv is BenchControl.GenericDevices.IPumpFM) @@ -131,13 +131,13 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; StartEditing(editors[e.SubItem], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!Unlocked || e.SubItem >= editors.Length) return; @@ -163,7 +163,7 @@ namespace TBF.UiControls } } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == (int)Column.Duration) { diff --git a/TBF/UiControls/CameraPictureCtrl.Designer.cs b/TBF/UI/Camera/CameraPictureCtrl.Designer.cs similarity index 98% rename from TBF/UiControls/CameraPictureCtrl.Designer.cs rename to TBF/UI/Camera/CameraPictureCtrl.Designer.cs index a8f44380d..a5a01bc42 100644 --- a/TBF/UiControls/CameraPictureCtrl.Designer.cs +++ b/TBF/UI/Camera/CameraPictureCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Camera { partial class CameraPictureCtrl { diff --git a/TBF/UiControls/CameraPictureCtrl.cs b/TBF/UI/Camera/CameraPictureCtrl.cs similarity index 93% rename from TBF/UiControls/CameraPictureCtrl.cs rename to TBF/UI/Camera/CameraPictureCtrl.cs index eb6ff78c6..716a38174 100644 --- a/TBF/UiControls/CameraPictureCtrl.cs +++ b/TBF/UI/Camera/CameraPictureCtrl.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// using System; using System.Drawing; using System.Windows.Forms; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Camera { public partial class CameraPictureCtrl : UserControl, ICameraPicture { @@ -45,7 +45,7 @@ namespace TBF.UiControls { InitializeComponent(); - captionLabel.Text = "No info available"; + captionLabel.Text = Strings.No_info_available; } public CameraPictureCtrl(ICameraPicture oriCamPicture) diff --git a/TBF/UiControls/CameraPictureCtrl.resx b/TBF/UI/Camera/CameraPictureCtrl.resx similarity index 100% rename from TBF/UiControls/CameraPictureCtrl.resx rename to TBF/UI/Camera/CameraPictureCtrl.resx diff --git a/TBF/UiControls/CameraPictureCtrl2.Designer.cs b/TBF/UI/Camera/CameraPictureCtrl2.Designer.cs similarity index 98% rename from TBF/UiControls/CameraPictureCtrl2.Designer.cs rename to TBF/UI/Camera/CameraPictureCtrl2.Designer.cs index 8aaa2374f..cefbe5d55 100644 --- a/TBF/UiControls/CameraPictureCtrl2.Designer.cs +++ b/TBF/UI/Camera/CameraPictureCtrl2.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Camera { partial class CameraPictureCtrl2 { diff --git a/TBF/UiControls/CameraPictureCtrl2.cs b/TBF/UI/Camera/CameraPictureCtrl2.cs similarity index 93% rename from TBF/UiControls/CameraPictureCtrl2.cs rename to TBF/UI/Camera/CameraPictureCtrl2.cs index e1343b400..291c7a483 100644 --- a/TBF/UiControls/CameraPictureCtrl2.cs +++ b/TBF/UI/Camera/CameraPictureCtrl2.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// using System; using System.Drawing; using System.Windows.Forms; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Camera { public partial class CameraPictureCtrl2 : UserControl, ICameraPicture { @@ -45,7 +45,7 @@ namespace TBF.UiControls { InitializeComponent(); - captionLabel.Text = "No info available"; + captionLabel.Text = Strings.No_info_available; } public CameraPictureCtrl2(ICameraPicture oriCamPicture) diff --git a/TBF/UiControls/CameraPictureCtrl2.resx b/TBF/UI/Camera/CameraPictureCtrl2.resx similarity index 100% rename from TBF/UiControls/CameraPictureCtrl2.resx rename to TBF/UI/Camera/CameraPictureCtrl2.resx diff --git a/TBF/UiControls/CameraPictureCtrl3.Designer.cs b/TBF/UI/Camera/CameraPictureCtrl3.Designer.cs similarity index 98% rename from TBF/UiControls/CameraPictureCtrl3.Designer.cs rename to TBF/UI/Camera/CameraPictureCtrl3.Designer.cs index 158e88fc6..2be44acc5 100644 --- a/TBF/UiControls/CameraPictureCtrl3.Designer.cs +++ b/TBF/UI/Camera/CameraPictureCtrl3.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Camera { partial class CameraPictureCtrl3 { diff --git a/TBF/UiControls/CameraPictureCtrl3.cs b/TBF/UI/Camera/CameraPictureCtrl3.cs similarity index 93% rename from TBF/UiControls/CameraPictureCtrl3.cs rename to TBF/UI/Camera/CameraPictureCtrl3.cs index ea5256969..4dc021ad0 100644 --- a/TBF/UiControls/CameraPictureCtrl3.cs +++ b/TBF/UI/Camera/CameraPictureCtrl3.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// using System; using System.Drawing; using System.Windows.Forms; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Camera { public partial class CameraPictureCtrl3 : UserControl, ICameraPicture { @@ -44,7 +44,7 @@ namespace TBF.UiControls { InitializeComponent(); - captionLabel.Text = "No info available"; + captionLabel.Text = Strings.No_info_available; } public CameraPictureCtrl3(ICameraPicture oriCamPicture) diff --git a/TBF/UiControls/CameraPictureCtrl3.resx b/TBF/UI/Camera/CameraPictureCtrl3.resx similarity index 100% rename from TBF/UiControls/CameraPictureCtrl3.resx rename to TBF/UI/Camera/CameraPictureCtrl3.resx diff --git a/TBF/UiControls/CameraPictureFullCtrl.Designer.cs b/TBF/UI/Camera/CameraPictureFullCtrl.Designer.cs similarity index 99% rename from TBF/UiControls/CameraPictureFullCtrl.Designer.cs rename to TBF/UI/Camera/CameraPictureFullCtrl.Designer.cs index a04971ef6..510755584 100644 --- a/TBF/UiControls/CameraPictureFullCtrl.Designer.cs +++ b/TBF/UI/Camera/CameraPictureFullCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Camera { partial class CameraPictureFullCtrl { diff --git a/TBF/UiControls/CameraPictureFullCtrl.cs b/TBF/UI/Camera/CameraPictureFullCtrl.cs similarity index 92% rename from TBF/UiControls/CameraPictureFullCtrl.cs rename to TBF/UI/Camera/CameraPictureFullCtrl.cs index 1d6e15b88..b237a8ecc 100644 --- a/TBF/UiControls/CameraPictureFullCtrl.cs +++ b/TBF/UI/Camera/CameraPictureFullCtrl.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// using System; using System.Drawing; using System.Windows.Forms; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Camera { public partial class CameraPictureFullCtrl : UserControl, ICameraPicture { @@ -44,7 +44,7 @@ namespace TBF.UiControls { InitializeComponent(); - captionLabel.Text = "No info available"; + captionLabel.Text = Strings.No_info_available; } public void UpdateLed(DateTime now) diff --git a/TBF/UiControls/CameraPictureFullCtrl.resx b/TBF/UI/Camera/CameraPictureFullCtrl.resx similarity index 100% rename from TBF/UiControls/CameraPictureFullCtrl.resx rename to TBF/UI/Camera/CameraPictureFullCtrl.resx diff --git a/TBF/UiControls/ICameraPicture.cs b/TBF/UI/Camera/ICameraPicture.cs similarity index 73% rename from TBF/UiControls/ICameraPicture.cs rename to TBF/UI/Camera/ICameraPicture.cs index 63c744bce..932c51883 100644 --- a/TBF/UiControls/ICameraPicture.cs +++ b/TBF/UI/Camera/ICameraPicture.cs @@ -1,7 +1,10 @@ -using System; +/// +/// Copyright (c) 2017 Sensus Slovensko a.s. +/// +using System; using System.Drawing; -namespace TBF.UiControls +namespace TBF.UI.Camera { public interface ICameraPicture { diff --git a/TBF/Screens/PicturesTabPageCtrl.Designer.cs b/TBF/UI/Camera/PicturesTabPageCtrl.Designer.cs similarity index 98% rename from TBF/Screens/PicturesTabPageCtrl.Designer.cs rename to TBF/UI/Camera/PicturesTabPageCtrl.Designer.cs index 2cb8e5653..481349888 100644 --- a/TBF/Screens/PicturesTabPageCtrl.Designer.cs +++ b/TBF/UI/Camera/PicturesTabPageCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.Screens +namespace TBF.UI.Camera { partial class PicturesTabPageCtrl { diff --git a/TBF/Screens/PicturesTabPageCtrl.cs b/TBF/UI/Camera/PicturesTabPageCtrl.cs similarity index 82% rename from TBF/Screens/PicturesTabPageCtrl.cs rename to TBF/UI/Camera/PicturesTabPageCtrl.cs index 0297e3b48..089e944c8 100644 --- a/TBF/Screens/PicturesTabPageCtrl.cs +++ b/TBF/UI/Camera/PicturesTabPageCtrl.cs @@ -1,30 +1,27 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Windows.Forms; using log4net; using Config.Entities; -using TBF.Resources; using TBF.UiBridge; -using TBF.BenchControl; -using TBF.BenchControl.Network.Camera.CLP1611; -namespace TBF.Screens +namespace TBF.UI.Camera { public partial class PicturesTabPageCtrl : UserControl { - static readonly ILog log = LogManager.GetLogger(typeof(MainWnd)); + static readonly ILog log = LogManager.GetLogger(typeof(TBF.UI.MainWnd)); CameraDisplayResolution resolution; - IList cameraPictures; + IList cameraPictures; public PicturesTabPageCtrl() { InitializeComponent(); - cameraPictures = new List(); + cameraPictures = new List(); if (Program.LocalSettings != null) resolution = Program.LocalSettings.Resolution; System.Windows.Forms.Timer timer; @@ -71,13 +68,13 @@ namespace TBF.Screens switch (resolution) { default: - case CameraDisplayResolution.Small: ctrl = new TBF.UiControls.CameraPictureCtrl(); break; - case CameraDisplayResolution.Medium: ctrl = new TBF.UiControls.CameraPictureCtrl2(); break; - case CameraDisplayResolution.Large: ctrl = new TBF.UiControls.CameraPictureCtrl3(); break; + case CameraDisplayResolution.Small: ctrl = new CameraPictureCtrl(); break; + case CameraDisplayResolution.Medium: ctrl = new CameraPictureCtrl2(); break; + case CameraDisplayResolution.Large: ctrl = new CameraPictureCtrl3(); break; } - cameraPictures.Add(ctrl as TBF.UiControls.ICameraPicture); + cameraPictures.Add(ctrl as ICameraPicture); picturesFlowLayoutPanel.Controls.Add(ctrl); - (ctrl as TBF.UiControls.ICameraPicture).Caption = args.Info; + (ctrl as ICameraPicture).Caption = args.Info; } else { @@ -120,7 +117,7 @@ namespace TBF.Screens void RedrawPictures() { int nrControls = cameraPictures.Count; - TBF.UiControls.ICameraPicture[] oriCamPictures = new TBF.UiControls.ICameraPicture[nrControls]; + ICameraPicture[] oriCamPictures = new ICameraPicture[nrControls]; for (int i = 0; i < nrControls; i++) oriCamPictures[i] = cameraPictures[i]; cameraPictures.Clear(); @@ -132,12 +129,12 @@ namespace TBF.Screens switch (resolution) { default: - case CameraDisplayResolution.Small: ctrl = new TBF.UiControls.CameraPictureCtrl(oriCamPictures[i]); break; - case CameraDisplayResolution.Medium: ctrl = new TBF.UiControls.CameraPictureCtrl2(oriCamPictures[i]); break; - case CameraDisplayResolution.Large: ctrl = new TBF.UiControls.CameraPictureCtrl3(oriCamPictures[i]); break; + case CameraDisplayResolution.Small: ctrl = new CameraPictureCtrl(oriCamPictures[i]); break; + case CameraDisplayResolution.Medium: ctrl = new CameraPictureCtrl2(oriCamPictures[i]); break; + case CameraDisplayResolution.Large: ctrl = new CameraPictureCtrl3(oriCamPictures[i]); break; } - cameraPictures.Add(ctrl as TBF.UiControls.ICameraPicture); + cameraPictures.Add(ctrl as ICameraPicture); picturesFlowLayoutPanel.Controls.Add(ctrl); } } diff --git a/TBF/Screens/PicturesTabPageCtrl.resx b/TBF/UI/Camera/PicturesTabPageCtrl.resx similarity index 100% rename from TBF/Screens/PicturesTabPageCtrl.resx rename to TBF/UI/Camera/PicturesTabPageCtrl.resx diff --git a/TBF/UI/Constants.cs b/TBF/UI/Constants.cs new file mode 100644 index 000000000..b87de3f98 --- /dev/null +++ b/TBF/UI/Constants.cs @@ -0,0 +1,8 @@ + +namespace TBF.UI +{ + public static class Constants + { + public const int Dpi100pct = 96; + } +} diff --git a/TBF/Screens/GraphsTabPageCtrl.cs b/TBF/UI/Graphs/GraphsTabPageCtrl.cs similarity index 99% rename from TBF/Screens/GraphsTabPageCtrl.cs rename to TBF/UI/Graphs/GraphsTabPageCtrl.cs index 6ce47975b..138abc2d1 100644 --- a/TBF/Screens/GraphsTabPageCtrl.cs +++ b/TBF/UI/Graphs/GraphsTabPageCtrl.cs @@ -12,7 +12,7 @@ using TBF.UiBridge; using GraphLib; using log4net; -namespace TBF.Screens +namespace TBF.UI.Graphs { public partial class GraphsTabPageCtrl : UserControl { diff --git a/TBF/Screens/GraphsTabPageCtrl.designer.cs b/TBF/UI/Graphs/GraphsTabPageCtrl.designer.cs similarity index 99% rename from TBF/Screens/GraphsTabPageCtrl.designer.cs rename to TBF/UI/Graphs/GraphsTabPageCtrl.designer.cs index 6e07d5cee..02e1e3108 100644 --- a/TBF/Screens/GraphsTabPageCtrl.designer.cs +++ b/TBF/UI/Graphs/GraphsTabPageCtrl.designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Sensus Slovensko a.s. /// -namespace TBF.Screens +namespace TBF.UI.Graphs { partial class GraphsTabPageCtrl { diff --git a/TBF/Screens/GraphsTabPageCtrl.resx b/TBF/UI/Graphs/GraphsTabPageCtrl.resx similarity index 100% rename from TBF/Screens/GraphsTabPageCtrl.resx rename to TBF/UI/Graphs/GraphsTabPageCtrl.resx diff --git a/TBF/Forms/AboutDlg.Designer.cs b/TBF/UI/Help/AboutDlg.Designer.cs similarity index 98% rename from TBF/Forms/AboutDlg.Designer.cs rename to TBF/UI/Help/AboutDlg.Designer.cs index b52689860..7745a3b83 100644 --- a/TBF/Forms/AboutDlg.Designer.cs +++ b/TBF/UI/Help/AboutDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Help { partial class AboutDlg { diff --git a/TBF/Forms/AboutDlg.cs b/TBF/UI/Help/AboutDlg.cs similarity index 94% rename from TBF/Forms/AboutDlg.cs rename to TBF/UI/Help/AboutDlg.cs index 00ae6f9c0..e99f99f91 100644 --- a/TBF/Forms/AboutDlg.cs +++ b/TBF/UI/Help/AboutDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Security.Cryptography; using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Help { /// /// About dialog diff --git a/TBF/Forms/AboutDlg.resx b/TBF/UI/Help/AboutDlg.resx similarity index 100% rename from TBF/Forms/AboutDlg.resx rename to TBF/UI/Help/AboutDlg.resx diff --git a/TBF/Screens/LogsTabPageCtrl.Designer.cs b/TBF/UI/Logs/LogsTabPageCtrl.Designer.cs similarity index 97% rename from TBF/Screens/LogsTabPageCtrl.Designer.cs rename to TBF/UI/Logs/LogsTabPageCtrl.Designer.cs index 1956c7ea0..cfdac7311 100644 --- a/TBF/Screens/LogsTabPageCtrl.Designer.cs +++ b/TBF/UI/Logs/LogsTabPageCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.Screens +namespace TBF.UI.Logs { partial class LogsTabPageCtrl { diff --git a/TBF/Screens/LogsTabPageCtrl.cs b/TBF/UI/Logs/LogsTabPageCtrl.cs similarity index 91% rename from TBF/Screens/LogsTabPageCtrl.cs rename to TBF/UI/Logs/LogsTabPageCtrl.cs index 409de6164..7e1015766 100644 --- a/TBF/Screens/LogsTabPageCtrl.cs +++ b/TBF/UI/Logs/LogsTabPageCtrl.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Windows.Forms; using TBF.Resources; using TBF.UiBridge; -namespace TBF.Screens +namespace TBF.UI.Logs { public partial class LogsTabPageCtrl : UserControl { diff --git a/TBF/Screens/LogsTabPageCtrl.resx b/TBF/UI/Logs/LogsTabPageCtrl.resx similarity index 100% rename from TBF/Screens/LogsTabPageCtrl.resx rename to TBF/UI/Logs/LogsTabPageCtrl.resx diff --git a/TBF/MainWnd.Designer.cs b/TBF/UI/MainWnd.Designer.cs similarity index 83% rename from TBF/MainWnd.Designer.cs rename to TBF/UI/MainWnd.Designer.cs index 5123cf3b1..399f561af 100644 --- a/TBF/MainWnd.Designer.cs +++ b/TBF/UI/MainWnd.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2017 Sensus Metering Systems /// -namespace TBF +namespace TBF.UI { partial class MainWnd { @@ -56,20 +56,19 @@ namespace TBF this.homeTabPage = new System.Windows.Forms.TabPage(); this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1(); this.processTabPage = new System.Windows.Forms.TabPage(); - this.processTabPageCtrl = new TBF.Screens.ProcessTabPageCtrl6(); + this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl6(); this.insertTabPage = new System.Windows.Forms.TabPage(); this.resultsTabPage = new System.Windows.Forms.TabPage(); - this.resultsTabPageCtrl = new TBF.Screens.ResultsTabPageCtrl(); + this.resultsTabPageCtrl = new TBF.UI.Results.ResultsTabPageCtrl(); this.graphsTabPage = new System.Windows.Forms.TabPage(); - this.graphsTabPageCtrl = new TBF.Screens.GraphsTabPageCtrl(); + this.graphsTabPageCtrl = new TBF.UI.Graphs.GraphsTabPageCtrl(); this.logsTabPage = new System.Windows.Forms.TabPage(); - this.logsTabPageCtrl = new TBF.Screens.LogsTabPageCtrl(); + this.logsTabPageCtrl = new TBF.UI.Logs.LogsTabPageCtrl(); this.picturesTabPage = new System.Windows.Forms.TabPage(); - this.picturesTabPageCtrl = new TBF.Screens.PicturesTabPageCtrl(); + this.picturesTabPageCtrl = new TBF.UI.Camera.PicturesTabPageCtrl(); this.rightHorizSplitContainer = new System.Windows.Forms.SplitContainer(); this.progressFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); this.measurementTabPage = new System.Windows.Forms.TabPage(); - this.MeasurementTabPageCtrl = new TBF.Screens.MeasurementTabPageCtrl(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.userInfoStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.statusPStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -87,12 +86,12 @@ namespace TBF this.logsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.usersTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.localSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.languageTSMItem = new System.Windows.Forms.ToolStripMenuItem(); this.databaseSettingsTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.backUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.backUpConfigurationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.backUpResultsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.passwortToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backUpTSMItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backUpConfigTSMItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backUpResultsTSMItem = new System.Windows.Forms.ToolStripMenuItem(); + this.passwdTSMItem = new System.Windows.Forms.ToolStripMenuItem(); this.upgradeTSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.iPerlHeadsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearCountersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -137,7 +136,6 @@ namespace TBF ((System.ComponentModel.ISupportInitialize)(this.rightHorizSplitContainer)).BeginInit(); this.rightHorizSplitContainer.Panel1.SuspendLayout(); this.rightHorizSplitContainer.SuspendLayout(); - this.measurementTabPage.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainMenuStrip.SuspendLayout(); this.SuspendLayout(); @@ -149,32 +147,30 @@ namespace TBF // // topVerticalSplitContainer.Panel1 // - resources.ApplyResources(this.topVerticalSplitContainer.Panel1, "topVerticalSplitContainer.Panel1"); this.topVerticalSplitContainer.Panel1.Controls.Add(this.activityGroupBox); + resources.ApplyResources(this.topVerticalSplitContainer.Panel1, "topVerticalSplitContainer.Panel1"); // // topVerticalSplitContainer.Panel2 // - resources.ApplyResources(this.topVerticalSplitContainer.Panel2, "topVerticalSplitContainer.Panel2"); this.topVerticalSplitContainer.Panel2.Controls.Add(this.topHorizontalSplitContainer); + resources.ApplyResources(this.topVerticalSplitContainer.Panel2, "topVerticalSplitContainer.Panel2"); // // activityGroupBox // - resources.ApplyResources(this.activityGroupBox, "activityGroupBox"); this.activityGroupBox.Controls.Add(this.messageLabel); this.activityGroupBox.Controls.Add(this.activityLabel); + resources.ApplyResources(this.activityGroupBox, "activityGroupBox"); this.activityGroupBox.Name = "activityGroupBox"; this.activityGroupBox.TabStop = false; // // messageLabel // resources.ApplyResources(this.messageLabel, "messageLabel"); - this.messageLabel.ImageKey = global::TBF.Resources.Strings.String1; this.messageLabel.Name = "messageLabel"; // // activityLabel // resources.ApplyResources(this.activityLabel, "activityLabel"); - this.activityLabel.ImageKey = global::TBF.Resources.Strings.String1; this.activityLabel.Name = "activityLabel"; // // topHorizontalSplitContainer @@ -185,12 +181,10 @@ namespace TBF // // topHorizontalSplitContainer.Panel1 // - resources.ApplyResources(this.topHorizontalSplitContainer.Panel1, "topHorizontalSplitContainer.Panel1"); this.topHorizontalSplitContainer.Panel1.Controls.Add(this.splitContainer1); // // topHorizontalSplitContainer.Panel2 // - resources.ApplyResources(this.topHorizontalSplitContainer.Panel2, "topHorizontalSplitContainer.Panel2"); this.topHorizontalSplitContainer.Panel2.Controls.Add(this.descriptionGroupBox); // // splitContainer1 @@ -201,18 +195,16 @@ namespace TBF // // splitContainer1.Panel1 // - resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1"); this.splitContainer1.Panel1.Controls.Add(this.procedureGroupBox); // // splitContainer1.Panel2 // - resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2"); this.splitContainer1.Panel2.Controls.Add(this.progressGroupBox); // // procedureGroupBox // - resources.ApplyResources(this.procedureGroupBox, "procedureGroupBox"); this.procedureGroupBox.Controls.Add(this.procedureComboBox); + resources.ApplyResources(this.procedureGroupBox, "procedureGroupBox"); this.procedureGroupBox.Name = "procedureGroupBox"; this.procedureGroupBox.TabStop = false; // @@ -225,8 +217,8 @@ namespace TBF // // progressGroupBox // - resources.ApplyResources(this.progressGroupBox, "progressGroupBox"); this.progressGroupBox.Controls.Add(this.mainProgressBar); + resources.ApplyResources(this.progressGroupBox, "progressGroupBox"); this.progressGroupBox.Name = "progressGroupBox"; this.progressGroupBox.TabStop = false; // @@ -237,15 +229,14 @@ namespace TBF // // descriptionGroupBox // - resources.ApplyResources(this.descriptionGroupBox, "descriptionGroupBox"); this.descriptionGroupBox.Controls.Add(this.descriptionLabel); + resources.ApplyResources(this.descriptionGroupBox, "descriptionGroupBox"); this.descriptionGroupBox.Name = "descriptionGroupBox"; this.descriptionGroupBox.TabStop = false; // // descriptionLabel // resources.ApplyResources(this.descriptionLabel, "descriptionLabel"); - this.descriptionLabel.ImageKey = global::TBF.Resources.Strings.String1; this.descriptionLabel.Name = "descriptionLabel"; // // verticalSplitContainer @@ -256,12 +247,10 @@ namespace TBF // // verticalSplitContainer.Panel1 // - resources.ApplyResources(this.verticalSplitContainer.Panel1, "verticalSplitContainer.Panel1"); this.verticalSplitContainer.Panel1.Controls.Add(this.horizontalSplitContainer); // // verticalSplitContainer.Panel2 // - resources.ApplyResources(this.verticalSplitContainer.Panel2, "verticalSplitContainer.Panel2"); this.verticalSplitContainer.Panel2.Controls.Add(this.rightHorizSplitContainer); // // horizontalSplitContainer @@ -272,18 +261,15 @@ namespace TBF // // horizontalSplitContainer.Panel1 // - resources.ApplyResources(this.horizontalSplitContainer.Panel1, "horizontalSplitContainer.Panel1"); this.horizontalSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control; this.horizontalSplitContainer.Panel1.Controls.Add(this.topVerticalSplitContainer); // // horizontalSplitContainer.Panel2 // - resources.ApplyResources(this.horizontalSplitContainer.Panel2, "horizontalSplitContainer.Panel2"); this.horizontalSplitContainer.Panel2.Controls.Add(this.mainTabControl); // // mainTabControl // - resources.ApplyResources(this.mainTabControl, "mainTabControl"); this.mainTabControl.Controls.Add(this.homeTabPage); this.mainTabControl.Controls.Add(this.processTabPage); this.mainTabControl.Controls.Add(this.insertTabPage); @@ -291,106 +277,93 @@ namespace TBF this.mainTabControl.Controls.Add(this.graphsTabPage); this.mainTabControl.Controls.Add(this.logsTabPage); this.mainTabControl.Controls.Add(this.picturesTabPage); + resources.ApplyResources(this.mainTabControl, "mainTabControl"); this.mainTabControl.Name = "mainTabControl"; this.mainTabControl.SelectedIndex = 0; this.mainTabControl.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; // // homeTabPage // - resources.ApplyResources(this.homeTabPage, "homeTabPage"); this.homeTabPage.BackColor = System.Drawing.SystemColors.Control; this.homeTabPage.Controls.Add(this.ctrlBrdComponent); - this.homeTabPage.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.homeTabPage, "homeTabPage"); this.homeTabPage.Name = "homeTabPage"; - this.homeTabPage.ToolTipText = global::TBF.Resources.Strings.String1; // // ctrlBrdComponent // - resources.ApplyResources(this.ctrlBrdComponent, "ctrlBrdComponent"); this.ctrlBrdComponent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + resources.ApplyResources(this.ctrlBrdComponent, "ctrlBrdComponent"); this.ctrlBrdComponent.Name = "ctrlBrdComponent"; // // processTabPage // - resources.ApplyResources(this.processTabPage, "processTabPage"); this.processTabPage.Controls.Add(this.processTabPageCtrl); - this.processTabPage.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.processTabPage, "processTabPage"); this.processTabPage.Name = "processTabPage"; - this.processTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.processTabPage.UseVisualStyleBackColor = true; // // processTabPageCtrl // - resources.ApplyResources(this.processTabPageCtrl, "processTabPageCtrl"); this.processTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; + resources.ApplyResources(this.processTabPageCtrl, "processTabPageCtrl"); this.processTabPageCtrl.Name = "processTabPageCtrl"; // // insertTabPage // - resources.ApplyResources(this.insertTabPage, "insertTabPage"); this.insertTabPage.BackColor = System.Drawing.Color.Silver; - this.insertTabPage.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.insertTabPage, "insertTabPage"); this.insertTabPage.Name = "insertTabPage"; - this.insertTabPage.ToolTipText = global::TBF.Resources.Strings.String1; // // resultsTabPage // - resources.ApplyResources(this.resultsTabPage, "resultsTabPage"); this.resultsTabPage.Controls.Add(this.resultsTabPageCtrl); - this.resultsTabPage.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.resultsTabPage, "resultsTabPage"); this.resultsTabPage.Name = "resultsTabPage"; - this.resultsTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.resultsTabPage.UseVisualStyleBackColor = true; // // resultsTabPageCtrl // - resources.ApplyResources(this.resultsTabPageCtrl, "resultsTabPageCtrl"); this.resultsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; + resources.ApplyResources(this.resultsTabPageCtrl, "resultsTabPageCtrl"); this.resultsTabPageCtrl.Name = "resultsTabPageCtrl"; // // graphsTabPage // - resources.ApplyResources(this.graphsTabPage, "graphsTabPage"); this.graphsTabPage.Controls.Add(this.graphsTabPageCtrl); - this.graphsTabPage.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.graphsTabPage, "graphsTabPage"); this.graphsTabPage.Name = "graphsTabPage"; - this.graphsTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.graphsTabPage.UseVisualStyleBackColor = true; // // graphsTabPageCtrl // - resources.ApplyResources(this.graphsTabPageCtrl, "graphsTabPageCtrl"); this.graphsTabPageCtrl.BackColor = System.Drawing.Color.Silver; + resources.ApplyResources(this.graphsTabPageCtrl, "graphsTabPageCtrl"); this.graphsTabPageCtrl.Name = "graphsTabPageCtrl"; // // logsTabPage // - resources.ApplyResources(this.logsTabPage, "logsTabPage"); this.logsTabPage.Controls.Add(this.logsTabPageCtrl); - this.logsTabPage.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.logsTabPage, "logsTabPage"); this.logsTabPage.Name = "logsTabPage"; - this.logsTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.logsTabPage.UseVisualStyleBackColor = true; // // logsTabPageCtrl // - resources.ApplyResources(this.logsTabPageCtrl, "logsTabPageCtrl"); this.logsTabPageCtrl.BackColor = System.Drawing.SystemColors.Control; + resources.ApplyResources(this.logsTabPageCtrl, "logsTabPageCtrl"); this.logsTabPageCtrl.Name = "logsTabPageCtrl"; // // picturesTabPage // - resources.ApplyResources(this.picturesTabPage, "picturesTabPage"); this.picturesTabPage.Controls.Add(this.picturesTabPageCtrl); - this.picturesTabPage.ImageKey = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.picturesTabPage, "picturesTabPage"); this.picturesTabPage.Name = "picturesTabPage"; - this.picturesTabPage.ToolTipText = global::TBF.Resources.Strings.String1; this.picturesTabPage.UseVisualStyleBackColor = true; // // picturesTabPageCtrl // - resources.ApplyResources(this.picturesTabPageCtrl, "picturesTabPageCtrl"); this.picturesTabPageCtrl.BackColor = System.Drawing.Color.Silver; + resources.ApplyResources(this.picturesTabPageCtrl, "picturesTabPageCtrl"); this.picturesTabPageCtrl.Name = "picturesTabPageCtrl"; // // rightHorizSplitContainer @@ -401,13 +374,8 @@ namespace TBF // // rightHorizSplitContainer.Panel1 // - resources.ApplyResources(this.rightHorizSplitContainer.Panel1, "rightHorizSplitContainer.Panel1"); this.rightHorizSplitContainer.Panel1.Controls.Add(this.progressFlowLayoutPanel); // - // rightHorizSplitContainer.Panel2 - // - resources.ApplyResources(this.rightHorizSplitContainer.Panel2, "rightHorizSplitContainer.Panel2"); - // // progressFlowLayoutPanel // resources.ApplyResources(this.progressFlowLayoutPanel, "progressFlowLayoutPanel"); @@ -417,54 +385,41 @@ namespace TBF // measurementTabPage // resources.ApplyResources(this.measurementTabPage, "measurementTabPage"); - this.measurementTabPage.Controls.Add(this.MeasurementTabPageCtrl); - this.measurementTabPage.ImageKey = global::TBF.Resources.Strings.String1; this.measurementTabPage.Name = "measurementTabPage"; - this.measurementTabPage.ToolTipText = global::TBF.Resources.Strings.String1; - this.measurementTabPage.UseVisualStyleBackColor = true; - // - // MeasurementTabPageCtrl - // - resources.ApplyResources(this.MeasurementTabPageCtrl, "MeasurementTabPageCtrl"); - this.MeasurementTabPageCtrl.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(150)))), ((int)(((byte)(180)))), ((int)(((byte)(200))))); - this.MeasurementTabPageCtrl.Name = "MeasurementTabPageCtrl"; // // statusStrip1 // - resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.userInfoStatusLabel, this.statusPStatusLabel, this.routeStatusLabel, this.activityStatusLabel}); + resources.ApplyResources(this.statusStrip1, "statusStrip1"); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.DoubleClick += new System.EventHandler(this.statusStrip1_DoubleClick); // // userInfoStatusLabel // - resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel"); this.userInfoStatusLabel.Name = "userInfoStatusLabel"; + resources.ApplyResources(this.userInfoStatusLabel, "userInfoStatusLabel"); // // statusPStatusLabel // - resources.ApplyResources(this.statusPStatusLabel, "statusPStatusLabel"); this.statusPStatusLabel.Name = "statusPStatusLabel"; - this.statusPStatusLabel.Text = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.statusPStatusLabel, "statusPStatusLabel"); // // routeStatusLabel // - resources.ApplyResources(this.routeStatusLabel, "routeStatusLabel"); this.routeStatusLabel.Name = "routeStatusLabel"; - this.routeStatusLabel.Text = global::TBF.Resources.Strings.String1; + resources.ApplyResources(this.routeStatusLabel, "routeStatusLabel"); // // activityStatusLabel // - resources.ApplyResources(this.activityStatusLabel, "activityStatusLabel"); this.activityStatusLabel.Name = "activityStatusLabel"; + resources.ApplyResources(this.activityStatusLabel, "activityStatusLabel"); // // benchTSMenuItem // - resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem"); this.benchTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.benchComponentsTSMenuItem, this.benchPathsTSMenuItem, @@ -473,150 +428,151 @@ namespace TBF this.toolStripSeparator1, this.exitToolStripMenuItem}); this.benchTSMenuItem.Name = "benchTSMenuItem"; + resources.ApplyResources(this.benchTSMenuItem, "benchTSMenuItem"); // // benchComponentsTSMenuItem // - resources.ApplyResources(this.benchComponentsTSMenuItem, "benchComponentsTSMenuItem"); this.benchComponentsTSMenuItem.Name = "benchComponentsTSMenuItem"; + resources.ApplyResources(this.benchComponentsTSMenuItem, "benchComponentsTSMenuItem"); this.benchComponentsTSMenuItem.Click += new System.EventHandler(this.benchComponentsTSMItem_Click); // // benchPathsTSMenuItem // - resources.ApplyResources(this.benchPathsTSMenuItem, "benchPathsTSMenuItem"); this.benchPathsTSMenuItem.Name = "benchPathsTSMenuItem"; + resources.ApplyResources(this.benchPathsTSMenuItem, "benchPathsTSMenuItem"); this.benchPathsTSMenuItem.Click += new System.EventHandler(this.benchPathsTSMItem_Click); // // benchTransitionsToolStripMenuItem // - resources.ApplyResources(this.benchTransitionsToolStripMenuItem, "benchTransitionsToolStripMenuItem"); this.benchTransitionsToolStripMenuItem.Name = "benchTransitionsToolStripMenuItem"; + resources.ApplyResources(this.benchTransitionsToolStripMenuItem, "benchTransitionsToolStripMenuItem"); this.benchTransitionsToolStripMenuItem.Click += new System.EventHandler(this.benchTransitionsTSMItem_Click); // // benchMetrologyTSMenuItem // - resources.ApplyResources(this.benchMetrologyTSMenuItem, "benchMetrologyTSMenuItem"); this.benchMetrologyTSMenuItem.Name = "benchMetrologyTSMenuItem"; + resources.ApplyResources(this.benchMetrologyTSMenuItem, "benchMetrologyTSMenuItem"); this.benchMetrologyTSMenuItem.Click += new System.EventHandler(this.benchMetrologyTSMItem_Click); // // toolStripSeparator1 // - resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); this.toolStripSeparator1.Name = "toolStripSeparator1"; + resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); // // exitToolStripMenuItem // - resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // homeTSMenuItem // - resources.ApplyResources(this.homeTSMenuItem, "homeTSMenuItem"); this.homeTSMenuItem.Name = "homeTSMenuItem"; + resources.ApplyResources(this.homeTSMenuItem, "homeTSMenuItem"); this.homeTSMenuItem.Click += new System.EventHandler(this.homeTSMenuItem_Click); // // resultsTSMenuItem // - resources.ApplyResources(this.resultsTSMenuItem, "resultsTSMenuItem"); this.resultsTSMenuItem.Name = "resultsTSMenuItem"; + resources.ApplyResources(this.resultsTSMenuItem, "resultsTSMenuItem"); // // logsTSMenuItem // - resources.ApplyResources(this.logsTSMenuItem, "logsTSMenuItem"); this.logsTSMenuItem.Name = "logsTSMenuItem"; + resources.ApplyResources(this.logsTSMenuItem, "logsTSMenuItem"); this.logsTSMenuItem.Click += new System.EventHandler(this.logsTSMenuItem_Click); // // editTSMenuItem // - resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem"); this.editTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.usersTSMenuItem, - this.localSettingsTSMenuItem, + this.languageTSMItem, this.databaseSettingsTSMenuItem, - this.backUpToolStripMenuItem, - this.passwortToolStripMenuItem, + this.backUpTSMItem, + this.passwdTSMItem, this.upgradeTSMenuItem, this.iPerlHeadsToolStripMenuItem, this.clearCountersToolStripMenuItem}); this.editTSMenuItem.Name = "editTSMenuItem"; + resources.ApplyResources(this.editTSMenuItem, "editTSMenuItem"); // // usersTSMenuItem // - resources.ApplyResources(this.usersTSMenuItem, "usersTSMenuItem"); this.usersTSMenuItem.Name = "usersTSMenuItem"; + resources.ApplyResources(this.usersTSMenuItem, "usersTSMenuItem"); this.usersTSMenuItem.Click += new System.EventHandler(this.usersTSMItem_Click); // - // localSettingsTSMenuItem + // languageTSMItem // - resources.ApplyResources(this.localSettingsTSMenuItem, "localSettingsTSMenuItem"); - this.localSettingsTSMenuItem.Name = "localSettingsTSMenuItem"; - this.localSettingsTSMenuItem.Click += new System.EventHandler(this.localSettingsTSMItem_Click); + this.languageTSMItem.Name = "languageTSMItem"; + resources.ApplyResources(this.languageTSMItem, "languageTSMItem"); + this.languageTSMItem.Click += new System.EventHandler(this.languageTSMItem_Click); // // databaseSettingsTSMenuItem // - resources.ApplyResources(this.databaseSettingsTSMenuItem, "databaseSettingsTSMenuItem"); this.databaseSettingsTSMenuItem.Name = "databaseSettingsTSMenuItem"; + resources.ApplyResources(this.databaseSettingsTSMenuItem, "databaseSettingsTSMenuItem"); this.databaseSettingsTSMenuItem.Click += new System.EventHandler(this.databaseSettingsTSMItem_Click); // - // backUpToolStripMenuItem + // backUpTSMItem // - resources.ApplyResources(this.backUpToolStripMenuItem, "backUpToolStripMenuItem"); - this.backUpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.backUpConfigurationToolStripMenuItem, - this.backUpResultsToolStripMenuItem}); - this.backUpToolStripMenuItem.Name = "backUpToolStripMenuItem"; + this.backUpTSMItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.backUpConfigTSMItem, + this.backUpResultsTSMItem}); + this.backUpTSMItem.Name = "backUpTSMItem"; + resources.ApplyResources(this.backUpTSMItem, "backUpTSMItem"); // - // backUpConfigurationToolStripMenuItem + // backUpConfigTSMItem // - resources.ApplyResources(this.backUpConfigurationToolStripMenuItem, "backUpConfigurationToolStripMenuItem"); - this.backUpConfigurationToolStripMenuItem.Name = "backUpConfigurationToolStripMenuItem"; - this.backUpConfigurationToolStripMenuItem.Click += new System.EventHandler(this.backUpConfigurationToolStripMenuItem_Click); + this.backUpConfigTSMItem.Name = "backUpConfigTSMItem"; + resources.ApplyResources(this.backUpConfigTSMItem, "backUpConfigTSMItem"); + this.backUpConfigTSMItem.Click += new System.EventHandler(this.backUpConfigTSMItem_Click); // - // backUpResultsToolStripMenuItem + // backUpResultsTSMItem // - resources.ApplyResources(this.backUpResultsToolStripMenuItem, "backUpResultsToolStripMenuItem"); - this.backUpResultsToolStripMenuItem.Name = "backUpResultsToolStripMenuItem"; - this.backUpResultsToolStripMenuItem.Click += new System.EventHandler(this.backUpResultsToolStripMenuItem_Click); + this.backUpResultsTSMItem.Name = "backUpResultsTSMItem"; + resources.ApplyResources(this.backUpResultsTSMItem, "backUpResultsTSMItem"); + this.backUpResultsTSMItem.Click += new System.EventHandler(this.backUpResultsTSMItem_Click); // - // passwortToolStripMenuItem + // passwdTSMItem // - resources.ApplyResources(this.passwortToolStripMenuItem, "passwortToolStripMenuItem"); - this.passwortToolStripMenuItem.Name = "passwortToolStripMenuItem"; + this.passwdTSMItem.Name = "passwdTSMItem"; + resources.ApplyResources(this.passwdTSMItem, "passwdTSMItem"); + this.passwdTSMItem.Click += new System.EventHandler(this.passwdTSMItem_Click); // // upgradeTSMenuItem // - resources.ApplyResources(this.upgradeTSMenuItem, "upgradeTSMenuItem"); this.upgradeTSMenuItem.Name = "upgradeTSMenuItem"; + resources.ApplyResources(this.upgradeTSMenuItem, "upgradeTSMenuItem"); this.upgradeTSMenuItem.Click += new System.EventHandler(this.upgradeTSMenuItem_Click); // // iPerlHeadsToolStripMenuItem // - resources.ApplyResources(this.iPerlHeadsToolStripMenuItem, "iPerlHeadsToolStripMenuItem"); this.iPerlHeadsToolStripMenuItem.Name = "iPerlHeadsToolStripMenuItem"; + resources.ApplyResources(this.iPerlHeadsToolStripMenuItem, "iPerlHeadsToolStripMenuItem"); this.iPerlHeadsToolStripMenuItem.Click += new System.EventHandler(this.iPerlHeadsToolStripMenuItem_Click); // // clearCountersToolStripMenuItem // - resources.ApplyResources(this.clearCountersToolStripMenuItem, "clearCountersToolStripMenuItem"); this.clearCountersToolStripMenuItem.Name = "clearCountersToolStripMenuItem"; + resources.ApplyResources(this.clearCountersToolStripMenuItem, "clearCountersToolStripMenuItem"); this.clearCountersToolStripMenuItem.Click += new System.EventHandler(this.clearCountersToolStripMenuItem_Click); // // helpTSMenuItem // - resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem"); this.helpTSMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.aboutTSMenuItem}); this.helpTSMenuItem.Name = "helpTSMenuItem"; + resources.ApplyResources(this.helpTSMenuItem, "helpTSMenuItem"); // // aboutTSMenuItem // - resources.ApplyResources(this.aboutTSMenuItem, "aboutTSMenuItem"); this.aboutTSMenuItem.Name = "aboutTSMenuItem"; + resources.ApplyResources(this.aboutTSMenuItem, "aboutTSMenuItem"); this.aboutTSMenuItem.Click += new System.EventHandler(this.aboutTSMItem_Click); // // mainMenuStrip // - resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip"); this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.benchTSMenuItem, this.proceduresToolStripMenuItem, @@ -627,30 +583,31 @@ namespace TBF this.logsTSMenuItem, this.editTSMenuItem, this.helpTSMenuItem}); + resources.ApplyResources(this.mainMenuStrip, "mainMenuStrip"); this.mainMenuStrip.Name = "mainMenuStrip"; // // proceduresToolStripMenuItem // - resources.ApplyResources(this.proceduresToolStripMenuItem, "proceduresToolStripMenuItem"); this.proceduresToolStripMenuItem.Name = "proceduresToolStripMenuItem"; + resources.ApplyResources(this.proceduresToolStripMenuItem, "proceduresToolStripMenuItem"); this.proceduresToolStripMenuItem.Click += new System.EventHandler(this.proceduresTSMItem_Click); // // processToolStripMenuItem // - resources.ApplyResources(this.processToolStripMenuItem, "processToolStripMenuItem"); this.processToolStripMenuItem.Name = "processToolStripMenuItem"; + resources.ApplyResources(this.processToolStripMenuItem, "processToolStripMenuItem"); this.processToolStripMenuItem.Click += new System.EventHandler(this.processTSMenuItem_Click); // // resultsToolStripMenuItem // - resources.ApplyResources(this.resultsToolStripMenuItem, "resultsToolStripMenuItem"); this.resultsToolStripMenuItem.Name = "resultsToolStripMenuItem"; + resources.ApplyResources(this.resultsToolStripMenuItem, "resultsToolStripMenuItem"); this.resultsToolStripMenuItem.Click += new System.EventHandler(this.resultsTSMenuItem_Click); // // graphsToolStripMenuItem // - resources.ApplyResources(this.graphsToolStripMenuItem, "graphsToolStripMenuItem"); this.graphsToolStripMenuItem.Name = "graphsToolStripMenuItem"; + resources.ApplyResources(this.graphsToolStripMenuItem, "graphsToolStripMenuItem"); this.graphsToolStripMenuItem.Click += new System.EventHandler(this.graphsToolStripMenuItem_Click); // // MainWnd @@ -703,7 +660,6 @@ namespace TBF this.rightHorizSplitContainer.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.rightHorizSplitContainer)).EndInit(); this.rightHorizSplitContainer.ResumeLayout(false); - this.measurementTabPage.ResumeLayout(false); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); this.mainMenuStrip.ResumeLayout(false); @@ -726,34 +682,33 @@ namespace TBF private System.Windows.Forms.ToolStripStatusLabel statusPStatusLabel; private System.Windows.Forms.ToolStripStatusLabel routeStatusLabel; private System.Windows.Forms.ToolStripStatusLabel activityStatusLabel; - public Screens.MeasurementTabPageCtrl MeasurementTabPageCtrl; - private Screens.ResultsTabPageCtrl resultsTabPageCtrl; - private Screens.LogsTabPageCtrl logsTabPageCtrl; + private Results.ResultsTabPageCtrl resultsTabPageCtrl; + private Logs.LogsTabPageCtrl logsTabPageCtrl; #if DN100 private ControlCom2VB.ControlCom2panel ctrlBrdComponent; - private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; + private ProcessTabPageCtrl6 processTabPageCtrl; #elif MUNICH || FUZHOU_150 private ControlComponent3Munich.UserControl1 ctrlBrdComponent; - private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; + private Process.ProcessTabPageCtrl6 processTabPageCtrl; #elif FUZHOU_300 private ControlComponent3F300.UserControl1 ctrlBrdComponent; - private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; + private Process.ProcessTabPageCtrl6 processTabPageCtrl; #elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200 private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent; - private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; + private Process.ProcessTabPageCtrl6 processTabPageCtrl; #elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200 || DEWA_300 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; - private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl; + private Process.ProcessTabPageCtrl6 processTabPageCtrl; #elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; - private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl; + private Process.ProcessTabPageCtrl24 processTabPageCtrl; #elif TURA_SPECIAL || SLM_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; - private TBF.Screens.ProcessTabPageExCtrl processTabPageCtrl; + private Process.ProcessTabPageExCtrl processTabPageCtrl; #elif TURA_IPERL || TURA_IPERL_NEW || IZRAEL_50 private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent; - private TBF.Screens.ProcessTabPageCtrl48 processTabPageCtrl; + private Process.ProcessTabPageCtrl48 processTabPageCtrl; #endif private System.Windows.Forms.ToolStripMenuItem benchTSMenuItem; @@ -762,9 +717,9 @@ namespace TBF private System.Windows.Forms.ToolStripMenuItem logsTSMenuItem; private System.Windows.Forms.ToolStripMenuItem editTSMenuItem; private System.Windows.Forms.ToolStripMenuItem usersTSMenuItem; - private System.Windows.Forms.ToolStripMenuItem localSettingsTSMenuItem; + private System.Windows.Forms.ToolStripMenuItem languageTSMItem; private System.Windows.Forms.ToolStripMenuItem databaseSettingsTSMenuItem; - private System.Windows.Forms.ToolStripMenuItem passwortToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem passwdTSMItem; private System.Windows.Forms.ToolStripMenuItem helpTSMenuItem; private System.Windows.Forms.ToolStripMenuItem aboutTSMenuItem; private System.Windows.Forms.MenuStrip mainMenuStrip; @@ -787,7 +742,7 @@ namespace TBF private System.Windows.Forms.ComboBox procedureComboBox; private System.Windows.Forms.ToolStripMenuItem benchTransitionsToolStripMenuItem; private System.Windows.Forms.TabPage picturesTabPage; - private Screens.PicturesTabPageCtrl picturesTabPageCtrl; + private Camera.PicturesTabPageCtrl picturesTabPageCtrl; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.GroupBox descriptionGroupBox; @@ -799,12 +754,12 @@ namespace TBF private System.Windows.Forms.SplitContainer topHorizontalSplitContainer; private System.Windows.Forms.ToolStripMenuItem upgradeTSMenuItem; private System.Windows.Forms.TabPage graphsTabPage; - private Screens.GraphsTabPageCtrl graphsTabPageCtrl; + private Graphs.GraphsTabPageCtrl graphsTabPageCtrl; private System.Windows.Forms.ToolStripMenuItem iPerlHeadsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem clearCountersToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem backUpToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem backUpConfigurationToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem backUpResultsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem backUpTSMItem; + private System.Windows.Forms.ToolStripMenuItem backUpConfigTSMItem; + private System.Windows.Forms.ToolStripMenuItem backUpResultsTSMItem; } } diff --git a/TBF/MainWnd.cs b/TBF/UI/MainWnd.cs similarity index 93% rename from TBF/MainWnd.cs rename to TBF/UI/MainWnd.cs index eea6733ed..c69ec120c 100644 --- a/TBF/MainWnd.cs +++ b/TBF/UI/MainWnd.cs @@ -4,16 +4,16 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.IO; +using System.Threading; using System.Windows.Forms; using log4net; using Config.Entities; -using TBF.UiBridge; using TBF.Resources; -using System.Threading; -using System.Diagnostics; -using System.IO; +using TBF.UiBridge; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI { /// /// Main program window @@ -24,7 +24,7 @@ namespace TBF const string ProcSeparator = " "; /// string separating procedure number and procedure name - public UiControls.BenchControlPanel BenchControlPanel; + public BenchControlPanel BenchControlPanel; public ProcedureInfo SelectedProcedure; public Procedure CurrentProcedure; public bool IsShutdownDisabled; @@ -33,12 +33,12 @@ namespace TBF /// /// This dialog is shown when emergency stop is activated /// - TBF.Forms.EmergencyStopForm emergencyStopModelessDlg; + Shared.EmergencyStopForm emergencyStopModelessDlg; /// /// This dialog is shown when TBF program is shutting down /// - TBF.Forms.ModelessActivityForm closingTbfMessageForm; + Shared.ModelessActivityForm closingTbfMessageForm; TestProgressControls testProgressControls; @@ -208,7 +208,7 @@ namespace TBF if (TBF.BenchControl.StateMachine.MachineState == TBF.BenchControl.MachineState.StartingUp) { - var form = new TBF.Forms.ModelessActivityForm() + var form = new Shared.ModelessActivityForm() { Message = Strings.Starting_system, FontFamily = "Arial", @@ -236,7 +236,7 @@ namespace TBF } #endif - //emergencyStopModelessDlg = new TBF.Forms.EmergencyStopForm(); + //emergencyStopModelessDlg = new Shared.EmergencyStopForm(); //emergencyStopModelessDlg.Show(); Bridge.ButtonsEtcHandler += delegate(object sndr, ButtonsEtcEventArgs args) @@ -299,26 +299,8 @@ namespace TBF rightHorizSplitContainer.SplitterDistance = Program.LocalSettings.RightPaneHorizSplitterDistance; topVerticalSplitContainer.SplitterDistance = Program.LocalSettings.TopPaneVerticalSplitterDistance; - /// Text boxes for data input, with border and white background - CustomStyle.Set(0, DockStyle.Fill, Color.White, BorderStyle.FixedSingle, false, - new System.Drawing.Font("Verdana", 10.5F, FontStyle.Regular, GraphicsUnit.Point, (byte)(238))); - - // Read only text boxes (labels), its background matches the window background - - /// Measurement - CustomStyle.Set(1, DockStyle.Fill, Color.FromArgb(150, 180, 200), BorderStyle.None, true, - new System.Drawing.Font("Verdana", 10.5F, FontStyle.Regular, GraphicsUnit.Point, (byte)(238))); - - /// Not used - CustomStyle.Set(2, DockStyle.Fill, Color.OliveDrab, BorderStyle.None, true, - new System.Drawing.Font("Verdana", 10.5F, FontStyle.Regular, GraphicsUnit.Point, (byte)(238))); - - /// Procedure - CustomStyle.Set(3, DockStyle.Fill, Color.FromArgb(200, 200, 150), BorderStyle.None, true, - new System.Drawing.Font("Verdana", 10.5F, FontStyle.Regular, GraphicsUnit.Point, (byte)(238))); - /// Initialize bench control user interface(s) - BenchControlPanel = new TBF.UiControls.BenchControlPanel(); + BenchControlPanel = new BenchControlPanel(); BenchControlPanel.BalancesCount = TBF.BenchControl.MettlerToledo.Standard.BalanceDev.BalancesCount + TBF.BenchControl.MettlerToledo.Multi.BalanceDev.BalancesCount + TBF.BenchControl.Various.TankWithLevelMsrmnt.Tank.TanksCount; @@ -488,17 +470,31 @@ namespace TBF //BenchControl.StateMachine.Stop(); } - private void benchComponentsTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new ComponentsManagerDlg().ShowDialog(); Cursor = Cursors.Default; } - private void benchPathsTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new PathsDlg().ShowDialog(); Cursor = Cursors.Default; } - private void benchTransitionsTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new TransitionsDlg().ShowDialog(); Cursor = Cursors.Default; } - private void benchMetrologyTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new MetrologyDlg().ShowDialog(); Cursor = Cursors.Default; } - private void proceduresTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new ProceduresDlg().ShowDialog(); Cursor = Cursors.Default; } - private void localSettingsTSMItem_Click(object s, EventArgs e) { new PreferencesDlg().ShowDialog(); } - private void aboutTSMItem_Click(object s, EventArgs e) { new Forms.AboutDlg().ShowDialog(); } + private void benchComponentsTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new TBF.UI.Bench.Components.ComponentsManagerDlg().ShowDialog(); Cursor = Cursors.Default; } + private void benchPathsTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new TBF.UI.Bench.Paths.PathsDlg().ShowDialog(); Cursor = Cursors.Default; } + private void benchTransitionsTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new TBF.UI.Bench.Transitions.TransitionsDlg().ShowDialog(); Cursor = Cursors.Default; } + private void benchMetrologyTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new TBF.UI.Bench.Metrology.MetrologyDlg().ShowDialog(); Cursor = Cursors.Default; } + private void proceduresTSMItem_Click(object s, EventArgs e) { Cursor = Cursors.WaitCursor; new TBF.UI.Procedures.ProceduresDlg().ShowDialog(); Cursor = Cursors.Default; } + private void usersTSMItem_Click(object s, EventArgs e) + { + Users.DB.ConnectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString; + Users.DB.DbType = Config.Data.CurrentBench.ProceduresDBSettings.DbType; +#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL + Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), true); + string connStr = Users.DB.ConnectionString; + int len = connStr.ToUpper().IndexOf("; UID="); + if (len == -1) len = connStr.ToUpper().IndexOf("; USER="); + if (len > 0) dlg.TitleExtension = connStr.Substring(0, len); +#else + Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), false); +#endif + dlg.ShowDialog(); + } + private void languageTSMItem_Click(object s, EventArgs e) { new TBF.UI.Settings.LanguageDlg().ShowDialog(); } private void databaseSettingsTSMItem_Click(object s, EventArgs e) { - BenchesDlg dlg = new BenchesDlg(); + TBF.UI.Settings.BenchesDlg dlg = new TBF.UI.Settings.BenchesDlg(); dlg.ShowDialog(); if (dlg.CurrentDBChanged) { @@ -515,22 +511,11 @@ namespace TBF } } } + private void backUpConfigTSMItem_Click(object s, EventArgs e) { BackupConfiguration(); } + private void backUpResultsTSMItem_Click(object s, EventArgs e) { BackupResults(); } + private void passwdTSMItem_Click(object s, EventArgs e) { new Users.Forms.PasswordChangeDlg(Users.GlobalData.GetCurrentUserName()).ShowDialog(); } + private void aboutTSMItem_Click(object s, EventArgs e) { new TBF.UI.Help.AboutDlg().ShowDialog(); } - private void usersTSMItem_Click(object s, EventArgs e) - { - Users.DB.ConnectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString; - Users.DB.DbType = Config.Data.CurrentBench.ProceduresDBSettings.DbType; -#if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL - Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), true); - string connStr = Users.DB.ConnectionString; - int len = connStr.ToUpper().IndexOf("; UID="); - if (len == -1) len = connStr.ToUpper().IndexOf("; USER="); - if (len > 0) dlg.TitleExtension = connStr.Substring(0, len); -#else - Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), false); -#endif - dlg.ShowDialog(); - } /// /// Read the database and re-initialize procedureComboBox items. @@ -745,7 +730,7 @@ namespace TBF return false; } - Forms.ClosingTbfForm closingForm = new Forms.ClosingTbfForm(); + ClosingTbfForm closingForm = new ClosingTbfForm(); DialogResult dr = closingForm.ShowDialog(); if (dr == DialogResult.Yes) @@ -757,7 +742,7 @@ namespace TBF IsShutdownPCAfterClosingTbf = closingForm.ShutDownPC; /// Show 'Closing_Test_Bench_Framework' modeless window in separate thread - closingTbfMessageForm = new TBF.Forms.ModelessActivityForm() + closingTbfMessageForm = new Shared.ModelessActivityForm() { Message = Strings.Closing_Test_Bench_Framework, FontFamily = "Arial", @@ -808,7 +793,7 @@ namespace TBF private void upgradeTSMenuItem_Click(object sender, EventArgs e) { - new Forms.UpgradeSelectionDlg().Show(); + new TBF.UI.Settings.UpgradeSelectionDlg().Show(); } private void iPerlHeadsToolStripMenuItem_Click(object sender, EventArgs e) @@ -856,7 +841,7 @@ namespace TBF /// /// Configuration database export (UI) /// - private void backUpConfigurationToolStripMenuItem_Click(object sender, EventArgs e) + void BackupConfiguration() { string connectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString; @@ -888,7 +873,7 @@ namespace TBF /// /// Results database export (UI) /// - private void backUpResultsToolStripMenuItem_Click(object sender, EventArgs e) + void BackupResults() { string connectionString = Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString; @@ -917,12 +902,12 @@ namespace TBF } } - TBF.Forms.ModelessActivityForm form; + Shared.ModelessActivityForm form; System.Threading.Thread formThread; /// void DBExportMessageStart(string message) { - form = new TBF.Forms.ModelessActivityForm() + form = new Shared.ModelessActivityForm() { Message = message, FontFamily = "Arial", @@ -960,7 +945,7 @@ namespace TBF try { - Process proc = new Process(); + System.Diagnostics.Process proc = new System.Diagnostics.Process(); proc.StartInfo.FileName = @"C:\xampp\mysql\bin\mysqldump"; proc.StartInfo.Arguments = string.Format("--user {0} --quick --default-character-set=utf8 {2} -r {3}", userName, password, databaseName, outputFileName); proc.StartInfo.RedirectStandardOutput = true; diff --git a/TBF/MainWnd.cs.resx b/TBF/UI/MainWnd.cs.resx similarity index 100% rename from TBF/MainWnd.cs.resx rename to TBF/UI/MainWnd.cs.resx diff --git a/TBF/MainWnd.de.resx b/TBF/UI/MainWnd.de.resx similarity index 100% rename from TBF/MainWnd.de.resx rename to TBF/UI/MainWnd.de.resx diff --git a/TBF/MainWnd.it.resx b/TBF/UI/MainWnd.it.resx similarity index 100% rename from TBF/MainWnd.it.resx rename to TBF/UI/MainWnd.it.resx diff --git a/TBF/MainWnd.pl.resx b/TBF/UI/MainWnd.pl.resx similarity index 100% rename from TBF/MainWnd.pl.resx rename to TBF/UI/MainWnd.pl.resx diff --git a/TBF/MainWnd.resx b/TBF/UI/MainWnd.resx similarity index 94% rename from TBF/MainWnd.resx rename to TBF/UI/MainWnd.resx index 28ec63adc..418cbda98 100644 --- a/TBF/MainWnd.resx +++ b/TBF/UI/MainWnd.resx @@ -117,1480 +117,1444 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1012, 523 - Fill - - helpTSMenuItem - - - 1 - - - 0, 0 - - - - 65 - - - Fill - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - benchTSMenuItem - - - Clear Counters - - - 2 - - - Verdana, 15.75pt - - - logsTabPage - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1012, 523 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topHorizontalSplitContainer - - - 1020 - - - Exit - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - verticalSplitContainer.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - passwortToolStripMenuItem - - - Upgrade - - - 0, 0 - - - Hydraulics - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - graphsTabPage - - - 152, 22 - - - $this - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - Logs - - - benchMetrologyTSMenuItem - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 0, 17 - - - 0 - - - 1 - - - 0 - - - True - - - benchComponentsTSMenuItem - - - picturesTabPageCtrl - - - picturesTabPage - - - 1 - + 0, 0 - - logsTSMenuItem - - - 0 - - - topVerticalSplitContainer.Panel1 - - - procedureGroupBox - - - 8, 15 - - - 1012, 523 - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1012, 523 - - - 1 - - - exitToolStripMenuItem - - - TBF.Screens.LogsTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TopDown - - - MainWnd - - - 52, 20 - - - mainTabControl - - - 1254, 22 - - - Configuration - - - splitContainer1.Panel2 - - - 152, 22 - - - 340 - - - Fill - - - 0 - - - 1012, 523 - - - Test Bench Framework - - - toolStripSeparator1 - - - 1 - - - 0, 25 - - + + True - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Measurement - - - 0 - - - proceduresToolStripMenuItem - - - 140, 6 - - - activityGroupBox - - - 671, 65 - - - True - - - Verdana, 12pt - - - horizontalSplitContainer - - - 1012, 523 - - - 0 - - - Fill - - - processTabPageCtrl - - - 143, 22 - - - mainMenuStrip - - - 0 - - - Profiles - Verdana, 15.75pt - - rightHorizSplitContainer.Panel1 - - - 0, 17 - - - benchPathsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 143, 22 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - horizontalSplitContainer - - - 21 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 4, 4, 4 - - - insertTabPage - NoControl - - 0 - - - 0 - - - activityStatusLabel - - - Language - - - 1012, 523 - - - Fill - - - 0 - - - 4, 5 - - - 0 - - - topHorizontalSplitContainer - - - 2 - - - 0 - - - Fill - - - topHorizontalSplitContainer.Panel1 - - - 0 - - - Results - - - Process - - - 1 - - - verticalSplitContainer - - - 1 - - - 143, 22 - - - topHorizontalSplitContainer.Panel1 - - - Insert - - - 61, 20 - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 252, 65 - - - 0, 25 - - - 0, 680 - - - 4, 5 - - - 13, 23 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - measurementTabPage - - - 148, 22 - - - rightHorizSplitContainer - - - 20 - - - 152, 22 - - - 1254, 24 - - - Microsoft Sans Serif, 8.25pt - - - Procedures - - - procedureGroupBox - - - NoControl - - - TBF.Screens.ResultsTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null - - - activityLabel - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - activityGroupBox - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1012, 523 - - - verticalSplitContainer - - - 1020, 532 - - - routeStatusLabel - - - 0, 0 - - - 0, 0 - - - processTabPage - - - Fill - - - splitContainer1 - - - 0 - - - progressFlowLayoutPanel - - - homeTabPage - - - MeasurementTabPageCtrl - - - horizontalSplitContainer - - - progressGroupBox - - - 1 - - - iPerl Heads - - - 0, 0 - - - 1020, 120 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 143, 22 - - - Bench - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - resultsTabPageCtrl - - - 0 - - - iPerlHeadsToolStripMenuItem - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 143, 22 - - - 23, 3, 3, 3 - - - processToolStripMenuItem - - - backUpToolStripMenuItem - - - 0 - - - 1012, 523 - - - 78, 20 - - - 0 - - - 15 - - - 6, 13 - - - picturesTabPage - - - 152, 22 - - - logsTabPage - - - resultsTabPage - - - 0, 17 - - - Graphs - - - 0, 1 - - - Fill - - - horizontalSplitContainer.Panel2 - - - 0, 0 - - - 4, 4, 4, 4 - - - mainTabControl - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Metrology - - - splitContainer1.Panel1 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - statusStrip1 - - - Microsoft Sans Serif, 8.25pt - - - descriptionGroupBox - - - 56, 20 - - - NoControl - - - 4, 5 - - - 4, 5 - - - 0 - - - 0, 0 - - - 120 - - - 1012, 523 - - - horizontalSplitContainer.Panel1 - - - ctrlBrdComponent - - - resultsTSMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - Back up - - - 0 - - - 0 - - - 4, 5 - - - topVerticalSplitContainer - - - Fill - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6, 28 - - - TBF.Screens.GraphsTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null - - - 671, 115 - - - Fill - - - 0, 0 - - - 3 - - - 2 - - - rightHorizSplitContainer.Panel2 - - - homeTSMenuItem - - - editTSMenuItem - - - 152, 22 - - - backUpResultsToolStripMenuItem - - - Paths - - - Fill - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 52, 20 - - - verticalSplitContainer.Panel2 - - - 4, 5 - - - 5 - - - Home - - - 5, 5 - - - 0 - - - topHorizontalSplitContainer.Panel2 - - - 44, 20 - - - 0 - - - Verdana, 11.25pt - - - graphsToolStripMenuItem - - - 22 - - - 0 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Process - - - userInfoStatusLabel - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 1 - - - 671, 46 - - - 1254, 656 - - - upgradeTSMenuItem - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 25 - - - 0 - - - verticalSplitContainer.Panel1 - - - verticalSplitContainer.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Results - - - Activity - - - 3 - - - TBF.Screens.ProcessTabPageCtrl24, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null - - - 19 - - - Results - - - databaseSettingsTSMenuItem - - - Fill - - - Graphs - - - 4, 5 - - - Microsoft Sans Serif, 8.25pt - - - localSettingsTSMenuItem - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0, 0 - - - rightHorizSplitContainer - - - Verdana, 12pt - - - horizontalSplitContainer.Panel1 - - - processTabPage - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 21 - 6, 68 - - TBF.Screens.PicturesTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null - - - 4, 5 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - Fill - - - 230, 240 - - - topVerticalSplitContainer - - - 6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Test results - - - 0 - - - Microsoft Sans Serif, 8.25pt - - - 152, 22 - - - 230, 656 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Help - - - topVerticalSplitContainer.Panel2 - - - 6, 23 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 18 - - - 56, 20 - - - mainTabControl - - - Password - - - topHorizontalSplitContainer.Panel2 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6 - - - backUpConfigurationToolStripMenuItem - - - mainTabControl - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - topVerticalSplitContainer.Panel1 - - - 0 - - - aboutTSMenuItem - - - 4 - - - rightHorizSplitContainer.Panel1 - - - mainTabControl - - - mainProgressBar - - - 0 - - - 152, 22 - - - 0, 0 - - - graphsTabPage - - - Verdana, 15.75pt - - - Logs - - - 44, 20 - - - 0 - - - False - - - Microsoft Sans Serif, 8.25pt - - - descriptionLabel - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5, 5, 0, 0 - - - 389, 33 - - - 0, 0 - - - topVerticalSplitContainer.Panel2 - - - 0, 0 - - - 0 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - rightHorizSplitContainer - - - Fill - - - Pictures - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - Fill - - - Settings - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - procedureComboBox - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0, 0 - - - True - - - 0 - - - resultsTabPage - - - Transitions + + 0, 25 1 - - 59, 20 - - - 0, 0 - - - graphsTabPageCtrl - - - False - - - About - - - Progress - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 2 - - - 13, 3, 13, 3 - - - 1 - - - Horizontal - - - 0, 0 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5, 5, 0, 0 - - - Fill - - - statusPStatusLabel - - - 415 - - - statusStrip1 - - - homeTabPage - - - splitContainer1 - - - 0, 13 - - - 107, 22 - - - 17 - - - measurementTabPage - - - topHorizontalSplitContainer - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Components - messageLabel - - mainTabControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1012, 523 - - - 0 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Verdana, 12pt - - - Fill - - - 335, 115 - - - 0, 0 - - - ControlComponent_Torino2015.UserControl1, ControlComponent3U, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - 30 - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1 + + activityGroupBox 0 - - 1020, 656 + + True - - 1254, 702 + + Verdana, 15.75pt - - 415, 65 + + NoControl - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 28 + + + 0, 25 + + + 0 + + + activityLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + activityGroupBox + + + 1 + + + Fill + + + Verdana, 12pt 5, 5 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 335, 115 - - 4, 4, 4, 4 + + 18 - - progressGroupBox + + Activity + + + activityGroupBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + topVerticalSplitContainer.Panel1 + + + 0 + + + 5, 5, 0, 0 + + + topVerticalSplitContainer.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + topVerticalSplitContainer + + + 0 + + + Fill + + + True + + + 5, 5 + + + Horizontal + + + Fill True - - 1 + + 0, 0 - - 0, 24 + + Fill - - 1 + + False - - logsTabPageCtrl + + Verdana, 15.75pt - - 31 + + 13, 23 - - 240 + + 23, 3, 3, 3 - - $this + + 389, 33 - - TBF.Screens.MeasurementTabPageCtrl, TBF, Version=2.22.1306.0, Culture=neutral, PublicKeyToken=null + + 6 - - resultsToolStripMenuItem + + procedureComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + procedureGroupBox + + + 0 + + + Fill + + + Verdana, 12pt + + + 0, 0 + + + 13, 3, 13, 3 + + + 415, 65 + + + 17 Procedure - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + procedureGroupBox - - topVerticalSplitContainer + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + splitContainer1.Panel1 - - $this + + 0 - - splitContainer1.Panel2 + + splitContainer1.Panel1 - - 237, 33 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Horizontal + + splitContainer1 - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 29 - - + 0 NoControl - - Users + + 6, 23 - - 32 + + 237, 33 - - 1012, 523 - - - verticalSplitContainer - - - benchTransitionsToolStripMenuItem - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 148, 22 - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + 0 - - 0, 17 + + mainProgressBar - + + System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + progressGroupBox + + 0 - + + Fill + + + Verdana, 12pt + + + 0, 0 + + + 252, 65 + + + 19 + + + Progress + + + progressGroupBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel2 + + 0 - + + splitContainer1.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1 + + + 1 + + + 671, 65 + + + 415 + + 0 - - splitContainer1.Panel1 + + splitContainer1 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 56, 20 + + topHorizontalSplitContainer.Panel1 - - mainTabControl + + 0 - - usersTSMenuItem + + topHorizontalSplitContainer.Panel1 - - 1012, 523 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - horizontalSplitContainer.Panel2 + + topHorizontalSplitContainer - - 4, 4, 4, 4 + + 0 - - 152, 22 + + True - - activityGroupBox + + NoControl - - clearCountersToolStripMenuItem + + 8, 15 - - mainMenuStrip + + 0, 13 + + + 0 + + + descriptionLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 descriptionGroupBox + + 0 + + + Fill + + + 0, 0 + + + 671, 46 + + + 20 + + + descriptionGroupBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + topHorizontalSplitContainer.Panel2 + + + 0 + + + topHorizontalSplitContainer.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + topHorizontalSplitContainer + + + 1 + + + 671, 115 + + + 65 + + + 0 + + + topHorizontalSplitContainer + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + topVerticalSplitContainer.Panel2 + + + 0 + + + 5, 5, 0, 0 + + + topVerticalSplitContainer.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + topVerticalSplitContainer + + + 1 + + + 1020, 120 + + + 340 + + + 21 + + + topVerticalSplitContainer + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + horizontalSplitContainer.Panel1 + + + 0 + + + Fill + + + True + + + 0, 24 + + + Fill + + + True + + + 0, 0 + + + Horizontal + + + horizontalSplitContainer.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + horizontalSplitContainer + + + 0 + + + Fill + + + 0, 0 + + + 1012, 523 + + + 1 + + + ctrlBrdComponent + + + ControlComponent3Munich.UserControl1, ControlComponent3Munich, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + homeTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 29 + + + Hydraulics + + + homeTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 0 + + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 1 + + + processTabPageCtrl + + + TBF.UI.Process.ProcessTabPageCtrl6, TBF, Version=2.18.1313.0, Culture=neutral, PublicKeyToken=null + + + processTabPage + + + 0 + + + 4, 5 + 1012, 523 - - True + + 30 - - Fill + + Process + + + processTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 1 + + + 4, 5 + + + 1012, 523 + + + 22 + + + Insert + + + insertTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 mainTabControl + + 2 + + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + 1012, 523 - + + 0 + + + resultsTabPageCtrl + + + TBF.UI.Results.ResultsTabPageCtrl, TBF, Version=2.18.1313.0, Culture=neutral, PublicKeyToken=null + + + resultsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 15 + + + Results + + + resultsTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 3 + + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 1012, 523 + + + 0 + + + graphsTabPageCtrl + + + TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=2.18.1313.0, Culture=neutral, PublicKeyToken=null + + + graphsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 32 + + + Graphs + + + graphsTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 4 + + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 4, 4, 4, 4 + + + 1012, 523 + + + 0 + + + logsTabPageCtrl + + + TBF.UI.Logs.LogsTabPageCtrl, TBF, Version=2.18.1313.0, Culture=neutral, PublicKeyToken=null + + + logsTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 21 + + + Logs + + + logsTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 5 + + + Fill + + + Microsoft Sans Serif, 8.25pt + + + 0, 0 + + + 1012, 523 + + + 0 + + + picturesTabPageCtrl + + + TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=2.18.1313.0, Culture=neutral, PublicKeyToken=null + + + picturesTabPage + + + 0 + + + 4, 5 + + + 1012, 523 + + + 31 + + + Pictures + + + picturesTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mainTabControl + + + 6 + + + Fill + + + 0, 1 + + + 0, 0 + + + 1020, 532 + + + 1 + + + mainTabControl + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + horizontalSplitContainer.Panel2 + + + 0 + + + horizontalSplitContainer.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + horizontalSplitContainer + + + 1 + + + 1020, 656 + + + 120 + + + 2 + + + horizontalSplitContainer + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + verticalSplitContainer.Panel1 + + + 0 + + + verticalSplitContainer.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + verticalSplitContainer + + + 0 + + + Fill + + + 0, 0 + + Horizontal - - pl + + True + + + Fill + + + TopDown + + + 0, 0 + + + 230, 240 + + + 1 + + + False + + + progressFlowLayoutPanel + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + rightHorizSplitContainer.Panel1 + + + 0 + + + rightHorizSplitContainer.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + rightHorizSplitContainer + + + 0 + + + rightHorizSplitContainer.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + rightHorizSplitContainer + + + 1 + + + 230, 656 + + + 240 + + + 0 + + + rightHorizSplitContainer + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + verticalSplitContainer.Panel2 + + + 0 + + + verticalSplitContainer.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + verticalSplitContainer + + + 1 + + + 1254, 656 + + + 1020 + + + 3 + + + verticalSplitContainer + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + 0, 0 + + + 200, 100 + + + 0 + + + measurementTabPage + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 152, 17 + + 0, 17 + + + 0, 17 + + + 0, 17 + + + 0, 17 + + + 0, 680 + + + 1254, 22 + + + 2 + + + statusStrip1 + + + statusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + 152, 22 + + + Components + + + 152, 22 + + + Paths + + + 152, 22 + + + Transitions + + + 152, 22 + + + Metrology + + + 149, 6 + + + 152, 22 + + + Exit + + + 52, 20 + + + Bench + + + 52, 20 + + + Home + + + 56, 20 + + + Results + + + 44, 20 + + + Logs + + + 152, 22 + + + Users + + + 152, 22 + + + Language + + + 152, 22 + + + Profiles + + + 148, 22 + + + Configuration + + + 148, 22 + + + Test results + + + 152, 22 + + + Back up + + + 152, 22 + + + Password + + + 152, 22 + + + Upgrade + + + 152, 22 + + + iPerl Heads + + + 152, 22 + + + Clear Counters + + + 61, 20 + + + Settings + + + 107, 22 + + + About + + + 44, 20 + + + Help + + + 17, 17 + + + 78, 20 + + + Procedures + + + 59, 20 + + + Process + + + 56, 20 + + + Results + + + 56, 20 + + + Graphs + + + 0, 0 + + + 1254, 24 + + + 0 + + + mainMenuStrip + + + mainMenuStrip + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + True 40 - - 152, 17 - - - 17, 17 - + + 6, 13 + + + 1254, 702 + + + Test Bench Framework + + + userInfoStatusLabel + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + statusPStatusLabel + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + routeStatusLabel + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + activityStatusLabel + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + benchTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + benchComponentsTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + benchPathsTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + benchTransitionsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + benchMetrologyTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripSeparator1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + exitToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + homeTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + resultsTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + logsTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + editTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + usersTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + languageTSMItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + databaseSettingsTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + backUpTSMItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + backUpConfigTSMItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + backUpResultsTSMItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + passwdTSMItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + upgradeTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iPerlHeadsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + clearCountersToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + helpTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + aboutTSMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + proceduresToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + processToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + resultsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + graphsToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MainWnd + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TBF/MainWnd.ru.resx b/TBF/UI/MainWnd.ru.resx similarity index 100% rename from TBF/MainWnd.ru.resx rename to TBF/UI/MainWnd.ru.resx diff --git a/TBF/MainWnd.zh-CN.resx b/TBF/UI/MainWnd.zh-CN.resx similarity index 100% rename from TBF/MainWnd.zh-CN.resx rename to TBF/UI/MainWnd.zh-CN.resx diff --git a/TBF/ProcedureDlg.Designer.cs b/TBF/UI/Procedures/ProcedureDlg.Designer.cs similarity index 96% rename from TBF/ProcedureDlg.Designer.cs rename to TBF/UI/Procedures/ProcedureDlg.Designer.cs index 1b63d2ef7..511b7f1af 100644 --- a/TBF/ProcedureDlg.Designer.cs +++ b/TBF/UI/Procedures/ProcedureDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2019 Sensus Slovensko a.s. /// -namespace TBF +namespace TBF.UI.Procedures { partial class ProcedureDlg { @@ -76,16 +76,16 @@ namespace TBF this.procNameTextBox = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.historyTabPage = new System.Windows.Forms.TabPage(); - this.historyListViewEx = new Results.Forms.ListViewEx(); + this.historyListViewEx = new global::Results.Forms.ListViewEx(); this.metrology1TabPage = new System.Windows.Forms.TabPage(); - this.metrology1ListViewEx = new Results.Forms.ListViewEx(); + this.metrology1ListViewEx = new global::Results.Forms.ListViewEx(); this.metrology2TabPage = new System.Windows.Forms.TabPage(); - this.metrology2ListViewEx = new Results.Forms.ListViewEx(); + this.metrology2ListViewEx = new global::Results.Forms.ListViewEx(); this.processTabPage = new System.Windows.Forms.TabPage(); - this.processListViewEx = new Results.Forms.ListViewEx(); + this.processListViewEx = new global::Results.Forms.ListViewEx(); this.parametersTabPage = new System.Windows.Forms.TabPage(); - this.parametersListViewEx = new Results.Forms.ListViewEx(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.parametersListViewEx = new global::Results.Forms.ListViewEx(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.mainSplitContainer)).BeginInit(); this.mainSplitContainer.Panel1.SuspendLayout(); this.mainSplitContainer.Panel2.SuspendLayout(); @@ -517,14 +517,14 @@ namespace TBF private System.Windows.Forms.SplitContainer mainSplitContainer; private System.Windows.Forms.TabControl tabControl; private System.Windows.Forms.TabPage historyTabPage; - private Results.Forms.ListViewEx historyListViewEx; + private global::Results.Forms.ListViewEx historyListViewEx; private System.Windows.Forms.TabPage metrology1TabPage; - private Results.Forms.ListViewEx metrology1ListViewEx; + private global::Results.Forms.ListViewEx metrology1ListViewEx; private System.Windows.Forms.TabPage metrology2TabPage; - private Results.Forms.ListViewEx metrology2ListViewEx; + private global::Results.Forms.ListViewEx metrology2ListViewEx; private System.Windows.Forms.TabPage processTabPage; - private Results.Forms.ListViewEx processListViewEx; - private UiControls.SharedButtons sharedButtons; + private global::Results.Forms.ListViewEx processListViewEx; + private TBF.UI.Shared.SharedButtons sharedButtons; private System.Windows.Forms.TabPage generalTabPage; private System.Windows.Forms.ComboBox fileWriter1ComboBox; private System.Windows.Forms.ComboBox printer1ComboBox; @@ -555,7 +555,7 @@ namespace TBF private System.Windows.Forms.RadioButton metersKindRadioButton2; private System.Windows.Forms.RadioButton metersKindRadioButton1; private System.Windows.Forms.TabPage parametersTabPage; - private Results.Forms.ListViewEx parametersListViewEx; + private global::Results.Forms.ListViewEx parametersListViewEx; private System.Windows.Forms.ComboBox fileWriter2ComboBox; private System.Windows.Forms.ComboBox fileWriter3ComboBox; private System.Windows.Forms.ComboBox printer2ComboBox; diff --git a/TBF/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs similarity index 96% rename from TBF/ProcedureDlg.cs rename to TBF/UI/Procedures/ProcedureDlg.cs index d55255929..ca45a810f 100644 --- a/TBF/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2018 Sensus Slovensko a.s. +/// Copyright (c) 2013-2019 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -7,14 +7,14 @@ using System.Linq; using System.Text; using System.Windows.Forms; using log4net; - +using Config.Entities; +using Results.Forms; using TBF.BenchControl.Generic; using TBF.BenchControl.GenericDevices; -using Config.Entities; using TBF.Resources; -using TBF.UiControls; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI.Procedures { public partial class ProcedureDlg : Form, IParentOfListViewEx { @@ -22,7 +22,6 @@ namespace TBF /// Used when re-scaling the dialog: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi public readonly int Dpi; - public const int Dpi100pct = 96; readonly bool openUnlocked; @@ -81,21 +80,21 @@ namespace TBF sharedButtons.DownClicked += downButton_Click; /// ListViewEx-es configuration - metrology1ListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(metrology1ListViewEx_SubItemClicked); - metrology1ListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked); - metrology1ListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing); + metrology1ListViewEx.SubItemClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemClicked); + metrology1ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology1ListViewEx_SubItemRightClicked); + metrology1ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology1ListViewEx_SubItemEndEditing); - metrology2ListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(metrology2ListViewEx_SubItemClicked); - metrology2ListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(metrology2ListViewEx_SubItemRightClicked); - metrology2ListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(metrology2ListViewEx_SubItemEndEditing); + metrology2ListViewEx.SubItemClicked += new SubItemEventHandler(metrology2ListViewEx_SubItemClicked); + metrology2ListViewEx.SubItemRightClicked += new SubItemEventHandler(metrology2ListViewEx_SubItemRightClicked); + metrology2ListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(metrology2ListViewEx_SubItemEndEditing); - processListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(processListViewEx_SubItemClicked); - processListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(processListViewEx_SubItemRightClicked); - processListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(processListViewEx_SubItemEndEditing); + processListViewEx.SubItemClicked += new SubItemEventHandler(processListViewEx_SubItemClicked); + processListViewEx.SubItemRightClicked += new SubItemEventHandler(processListViewEx_SubItemRightClicked); + processListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(processListViewEx_SubItemEndEditing); - parametersListViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemClicked); - parametersListViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(parametersListViewEx_SubItemRightClicked); - parametersListViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing); + parametersListViewEx.SubItemClicked += new SubItemEventHandler(parametersListViewEx_SubItemClicked); + parametersListViewEx.SubItemRightClicked += new SubItemEventHandler(parametersListViewEx_SubItemRightClicked); + parametersListViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(parametersListViewEx_SubItemEndEditing); SelectedTestIx = -1; } @@ -665,7 +664,7 @@ namespace TBF void PrepareMetrology1Tab() { - Results.Forms.ListViewEx lv = metrology1ListViewEx; + ListViewEx lv = metrology1ListViewEx; lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Q_from_m3h, Width = 80 }); @@ -772,7 +771,7 @@ namespace TBF } } - private void metrology1ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + private void metrology1ListViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (unlocked && (e.SubItem < (int)MtrlgyClmn.CoulumnsCount)) { @@ -780,7 +779,7 @@ namespace TBF } } - void metrology1ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void metrology1ListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)MtrlgyClmn.CoulumnsCount) return; @@ -806,7 +805,7 @@ namespace TBF } } - private void metrology1ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void metrology1ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == (int)MtrlgyClmn.Name) { @@ -920,7 +919,7 @@ namespace TBF void PrepareMetrology2Tab() { - Results.Forms.ListViewEx lv = metrology2ListViewEx; + ListViewEx lv = metrology2ListViewEx; lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Emptying_chdr, Width = 60 }); @@ -1051,7 +1050,7 @@ namespace TBF } } - private void metrology2ListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + private void metrology2ListViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)Mtrlgy2Clmn.ColumnsCount) { @@ -1061,7 +1060,7 @@ namespace TBF metrology2ListViewEx.StartEditing(metrology2Editors[e.SubItem], e.Item, e.SubItem); } - void metrology2ListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void metrology2ListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)Mtrlgy2Clmn.ColumnsCount) { @@ -1090,7 +1089,7 @@ namespace TBF } } - private void metrology2ListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void metrology2ListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == (int)Mtrlgy2Clmn.Name) { @@ -1171,7 +1170,7 @@ namespace TBF void PrepareProcess() { - Results.Forms.ListViewEx lv = processListViewEx; + ListViewEx lv = processListViewEx; lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Feeding_chdr, Width = 80 }); @@ -1315,7 +1314,7 @@ namespace TBF } } - private void processListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + private void processListViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)ProcessClmn.ColumnsCount) { @@ -1325,7 +1324,7 @@ namespace TBF processListViewEx.StartEditing(processEditors[e.SubItem], e.Item, e.SubItem); } - void processListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void processListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)ProcessClmn.ColumnsCount) { @@ -1354,7 +1353,7 @@ namespace TBF } } - private void processListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void processListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == (int)ProcessClmn.Name) { @@ -1416,7 +1415,7 @@ namespace TBF void PrepareParameters() { - Results.Forms.ListViewEx lv = parametersListViewEx; + ListViewEx lv = parametersListViewEx; lv.Columns.Add(new ColumnHeader { Text = Strings.Test_chdr, Width = 70 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 }); lv.Columns.Add(new ColumnHeader { Text = Strings.Pump_power_pct, Width = 90 }); @@ -1554,7 +1553,7 @@ namespace TBF } } - private void parametersListViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + private void parametersListViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)ParametersClmn.ColumnsCount) { @@ -1564,7 +1563,7 @@ namespace TBF parametersListViewEx.StartEditing(parametersEditors[e.SubItem], e.Item, e.SubItem); } - void parametersListViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void parametersListViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.SubItem >= (int)ParametersClmn.ColumnsCount) { @@ -1593,7 +1592,7 @@ namespace TBF } } - private void parametersListViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void parametersListViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { if (e.SubItem == (int)ParametersClmn.Name) { @@ -1732,7 +1731,7 @@ namespace TBF transitionEndComboBox.Enabled = true; notesTextBox.Enabled = true; - Results.Forms.ListViewEx listViewEx; + ListViewEx listViewEx; switch (selectedTab) { @@ -1891,7 +1890,7 @@ namespace TBF sharedButtons.DisableButtons(SharedButtons.Buttons.Remove); - Results.Forms.ListViewEx lv = null; + ListViewEx lv = null; /// switch (selectedTab) { @@ -1951,7 +1950,7 @@ namespace TBF private void addButton_Click(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx; + ListViewEx listViewEx; switch (selectedTab) { @@ -2124,7 +2123,7 @@ namespace TBF private void removeButton_Click(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx; + ListViewEx listViewEx; switch (selectedTab) { @@ -2177,7 +2176,7 @@ namespace TBF private void upButton_Click(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx; + ListViewEx listViewEx; switch (selectedTab) { @@ -2228,7 +2227,7 @@ namespace TBF private void downButton_Click(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx; + ListViewEx listViewEx; switch (selectedTab) { @@ -2289,7 +2288,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; + ListViewEx listViewEx = sender as ListViewEx; if (listViewEx.SelectedItems.Count != 1) { UpdateButtonStates(SharedButtons.SelectedItemPos.None); diff --git a/TBF/ProcedureDlg.resx b/TBF/UI/Procedures/ProcedureDlg.resx similarity index 100% rename from TBF/ProcedureDlg.resx rename to TBF/UI/Procedures/ProcedureDlg.resx diff --git a/TBF/UiControls/ProcedureParamsCtrl.Designer.cs b/TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs similarity index 88% rename from TBF/UiControls/ProcedureParamsCtrl.Designer.cs rename to TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs index 5dfc45d99..331c31a7f 100644 --- a/TBF/UiControls/ProcedureParamsCtrl.Designer.cs +++ b/TBF/UI/Procedures/ProcedureParamsCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Procedures { partial class ProcedureParamsCtrl { @@ -31,7 +31,7 @@ namespace TBF.UiControls /// private void InitializeComponent() { - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); this.SuspendLayout(); // // listViewEx @@ -60,6 +60,6 @@ namespace TBF.UiControls #endregion - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UiControls/ProcedureParamsCtrl.cs b/TBF/UI/Procedures/ProcedureParamsCtrl.cs similarity index 90% rename from TBF/UiControls/ProcedureParamsCtrl.cs rename to TBF/UI/Procedures/ProcedureParamsCtrl.cs index 11eee9549..a02cebf88 100644 --- a/TBF/UiControls/ProcedureParamsCtrl.cs +++ b/TBF/UI/Procedures/ProcedureParamsCtrl.cs @@ -1,14 +1,15 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; +using Results.Forms; using TBF.BenchControl.Generic; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Procedures { /// --------------- /// / Path or other \ @@ -109,20 +110,20 @@ namespace TBF.UiControls } } - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); RedrawAll(); } - private void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + private void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.Item.Tag == null || e.SubItem < nrFixedColumns || e.SubItem >= nrFixedColumns + editors.Length) return; listViewEx.StartEditing(editors[e.SubItem - nrFixedColumns], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { if (!unlocked || e.Item.Tag == null || e.SubItem < nrFixedColumns || e.SubItem >= nrFixedColumns + editors.Length) return; @@ -155,7 +156,7 @@ namespace TBF.UiControls } } - private void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { string message; if ((e.Item.Tag as IParamsProvider).ValidateParam(e.SubItem - nrFixedColumns, e.DisplayText, out message)) diff --git a/TBF/UiControls/ProcedureParamsCtrl.resx b/TBF/UI/Procedures/ProcedureParamsCtrl.resx similarity index 100% rename from TBF/UiControls/ProcedureParamsCtrl.resx rename to TBF/UI/Procedures/ProcedureParamsCtrl.resx diff --git a/TBF/UiControls/ProceduresCtrl.cs b/TBF/UI/Procedures/ProceduresCtrl.cs similarity index 94% rename from TBF/UiControls/ProceduresCtrl.cs rename to TBF/UI/Procedures/ProceduresCtrl.cs index d033aecde..e4f32f2ef 100644 --- a/TBF/UiControls/ProceduresCtrl.cs +++ b/TBF/UI/Procedures/ProceduresCtrl.cs @@ -5,16 +5,18 @@ using System; using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Text; using System.Windows.Forms; using NHibernate; using log4net; using Config.Entities; +using Results.Forms; using TBF.BenchControl; using TBF.BenchControl.GenericDevices; using TBF.Resources; -using System.Text; +using TBF.UI.Shared; -namespace TBF.UiControls +namespace TBF.UI.Procedures { public class ProceduresCtrl : BaseWithListViewEx, ITabWithListViewEx { @@ -50,15 +52,15 @@ namespace TBF.UiControls this.parent = parent; this.parentControl = parentControl; - SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); /// ListViewEx columns TBF.LocalSettings ls = Program.LocalSettings; - Columns.Add(Strings.Nr, (ls.ProceduresColumnCount > 0) ? ls.ProceduresColumnWidths[0] : (30 * parent.Dpi / PathsDlg.Dpi100pct)); - Columns.Add(Strings.Name, (ls.ProceduresColumnCount > 1) ? ls.ProceduresColumnWidths[1] : (100 * parent.Dpi / PathsDlg.Dpi100pct)); - Columns.Add(Strings.DescriptionColHdr, (ls.ProceduresColumnCount > 2) ? ls.ProceduresColumnWidths[2] : (300 * parent.Dpi / PathsDlg.Dpi100pct)); - Columns.Add(Strings.More, (ls.ProceduresColumnCount > 3) ? ls.ProceduresColumnWidths[3] : (300 * parent.Dpi / PathsDlg.Dpi100pct)); + Columns.Add(Strings.Nr, (ls.ProceduresColumnCount > 0) ? ls.ProceduresColumnWidths[0] : (30 * parent.Dpi / Constants.Dpi100pct)); + Columns.Add(Strings.Name, (ls.ProceduresColumnCount > 1) ? ls.ProceduresColumnWidths[1] : (100 * parent.Dpi / Constants.Dpi100pct)); + Columns.Add(Strings.DescriptionColHdr, (ls.ProceduresColumnCount > 2) ? ls.ProceduresColumnWidths[2] : (300 * parent.Dpi / Constants.Dpi100pct)); + Columns.Add(Strings.More, (ls.ProceduresColumnCount > 3) ? ls.ProceduresColumnWidths[3] : (300 * parent.Dpi / Constants.Dpi100pct)); editors = new Control[columnsCount]; /// @@ -92,11 +94,11 @@ namespace TBF.UiControls base.RedrawAll(); } - void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { } - void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { } diff --git a/TBF/ProceduresDlg.Designer.cs b/TBF/UI/Procedures/ProceduresDlg.Designer.cs similarity index 93% rename from TBF/ProceduresDlg.Designer.cs rename to TBF/UI/Procedures/ProceduresDlg.Designer.cs index 1c940267d..8f92d3916 100644 --- a/TBF/ProceduresDlg.Designer.cs +++ b/TBF/UI/Procedures/ProceduresDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2019 Sensus Slovensko a.s. /// -namespace TBF +namespace TBF.UI.Procedures { partial class ProceduresDlg { @@ -32,8 +32,8 @@ namespace TBF private void InitializeComponent() { this.splitContainer = new System.Windows.Forms.SplitContainer(); - this.proceduresCtrl = new TBF.UiControls.ProceduresCtrl(); - this.sharedButtons = new TBF.UiControls.SharedButtons(); + this.proceduresCtrl = new ProceduresCtrl(); + this.sharedButtons = new TBF.UI.Shared.SharedButtons(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); @@ -101,7 +101,7 @@ namespace TBF #endregion private System.Windows.Forms.SplitContainer splitContainer; - private UiControls.SharedButtons sharedButtons; - private UiControls.ProceduresCtrl proceduresCtrl; + private TBF.UI.Shared.SharedButtons sharedButtons; + private ProceduresCtrl proceduresCtrl; } } \ No newline at end of file diff --git a/TBF/ProceduresDlg.cs b/TBF/UI/Procedures/ProceduresDlg.cs similarity index 98% rename from TBF/ProceduresDlg.cs rename to TBF/UI/Procedures/ProceduresDlg.cs index 91ad9845b..fac4eff90 100644 --- a/TBF/ProceduresDlg.cs +++ b/TBF/UI/Procedures/ProceduresDlg.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Windows.Forms; using log4net; using TBF.Resources; -using TBF.UiControls; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI.Procedures { public partial class ProceduresDlg : Form { @@ -16,7 +16,6 @@ namespace TBF /// Used when re-scaling the dialog: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi public readonly int Dpi; - public const int Dpi100pct = 96; public ProceduresDlg() { @@ -179,7 +178,7 @@ namespace TBF /// void SelectedIndexChanged(object sender, EventArgs e) { - Results.Forms.ListViewEx listViewEx = sender as Results.Forms.ListViewEx; + global::Results.Forms.ListViewEx listViewEx = sender as global::Results.Forms.ListViewEx; if (listViewEx.SelectedItems.Count != 1) { /// No item selected diff --git a/TBF/ProceduresDlg.resx b/TBF/UI/Procedures/ProceduresDlg.resx similarity index 100% rename from TBF/ProceduresDlg.resx rename to TBF/UI/Procedures/ProceduresDlg.resx diff --git a/TBF/UiControls/TestParamsCtrl.Designer.cs b/TBF/UI/Procedures/TestParamsCtrl.Designer.cs similarity index 88% rename from TBF/UiControls/TestParamsCtrl.Designer.cs rename to TBF/UI/Procedures/TestParamsCtrl.Designer.cs index 3624dae93..727eba137 100644 --- a/TBF/UiControls/TestParamsCtrl.Designer.cs +++ b/TBF/UI/Procedures/TestParamsCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Procedures { partial class TestParamsCtrl { @@ -31,7 +31,7 @@ namespace TBF.UiControls /// private void InitializeComponent() { - this.listViewEx = new Results.Forms.ListViewEx(); + this.listViewEx = new global::Results.Forms.ListViewEx(); this.SuspendLayout(); // // listViewEx @@ -60,6 +60,6 @@ namespace TBF.UiControls #endregion - private Results.Forms.ListViewEx listViewEx; + private global::Results.Forms.ListViewEx listViewEx; } } diff --git a/TBF/UiControls/TestParamsCtrl.cs b/TBF/UI/Procedures/TestParamsCtrl.cs similarity index 91% rename from TBF/UiControls/TestParamsCtrl.cs rename to TBF/UI/Procedures/TestParamsCtrl.cs index a69353212..1b1a51f48 100644 --- a/TBF/UiControls/TestParamsCtrl.cs +++ b/TBF/UI/Procedures/TestParamsCtrl.cs @@ -1,14 +1,15 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; +using Results.Forms; using TBF.BenchControl.Generic; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Procedures { // ----------- // / Component \ @@ -34,7 +35,7 @@ namespace TBF.UiControls bool unlocked; public void Unlock() { unlocked = true; } - public Results.Forms.ListViewEx LVEx { get { return listViewEx; } } + public ListViewEx LVEx { get { return listViewEx; } } public TestParamsCtrl() { @@ -96,9 +97,9 @@ namespace TBF.UiControls } } - listViewEx.SubItemClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemClicked); - listViewEx.SubItemRightClicked += new Results.Forms.SubItemEventHandler(listViewEx_SubItemRightClicked); - listViewEx.SubItemEndEditing += new Results.Forms.SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); + listViewEx.SubItemClicked += new SubItemEventHandler(listViewEx_SubItemClicked); + listViewEx.SubItemRightClicked += new SubItemEventHandler(listViewEx_SubItemRightClicked); + listViewEx.SubItemEndEditing += new SubItemEndEditingEventHandler(listViewEx_SubItemEndEditing); RedrawAll(); } @@ -122,7 +123,7 @@ namespace TBF.UiControls return providers; } - private void listViewEx_SubItemClicked(object sender, Results.Forms.SubItemEventArgs e) + private void listViewEx_SubItemClicked(object sender, SubItemEventArgs e) { int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem; if (!unlocked || e.Item.Tag == null || itemNr >= editors.Length || itemNr < 0) return; @@ -130,7 +131,7 @@ namespace TBF.UiControls listViewEx.StartEditing(editors[itemNr], e.Item, e.SubItem); } - void listViewEx_SubItemRightClicked(object sender, Results.Forms.SubItemEventArgs e) + void listViewEx_SubItemRightClicked(object sender, SubItemEventArgs e) { int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem; if (!unlocked || e.Item.Tag == null || itemNr >= editors.Length || itemNr < 0) return; @@ -163,7 +164,7 @@ namespace TBF.UiControls } } - private void listViewEx_SubItemEndEditing(object sender, Results.Forms.SubItemEndEditingEventArgs e) + private void listViewEx_SubItemEndEditing(object sender, SubItemEndEditingEventArgs e) { string message; int itemNr = showTestsColumn ? (e.SubItem - 1) : e.SubItem; diff --git a/TBF/UiControls/TestParamsCtrl.resx b/TBF/UI/Procedures/TestParamsCtrl.resx similarity index 100% rename from TBF/UiControls/TestParamsCtrl.resx rename to TBF/UI/Procedures/TestParamsCtrl.resx diff --git a/TBF/TestWizard/FlowSelection.Designer.cs b/TBF/UI/Procedures/TestWizard/FlowSelection.Designer.cs similarity index 99% rename from TBF/TestWizard/FlowSelection.Designer.cs rename to TBF/UI/Procedures/TestWizard/FlowSelection.Designer.cs index d773f483e..69bda5f5c 100644 --- a/TBF/TestWizard/FlowSelection.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/FlowSelection.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class FlowSelection { diff --git a/TBF/TestWizard/FlowSelection.cs b/TBF/UI/Procedures/TestWizard/FlowSelection.cs similarity index 98% rename from TBF/TestWizard/FlowSelection.cs rename to TBF/UI/Procedures/TestWizard/FlowSelection.cs index ff84778f8..4aed0b072 100644 --- a/TBF/TestWizard/FlowSelection.cs +++ b/TBF/UI/Procedures/TestWizard/FlowSelection.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -7,7 +7,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class FlowSelection : Form { diff --git a/TBF/TestWizard/FlowSelection.resx b/TBF/UI/Procedures/TestWizard/FlowSelection.resx similarity index 100% rename from TBF/TestWizard/FlowSelection.resx rename to TBF/UI/Procedures/TestWizard/FlowSelection.resx diff --git a/TBF/TestWizard/HeatMetersSelection.Designer.cs b/TBF/UI/Procedures/TestWizard/HeatMetersSelection.Designer.cs similarity index 99% rename from TBF/TestWizard/HeatMetersSelection.Designer.cs rename to TBF/UI/Procedures/TestWizard/HeatMetersSelection.Designer.cs index 450b3b545..eb5e98425 100644 --- a/TBF/TestWizard/HeatMetersSelection.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/HeatMetersSelection.Designer.cs @@ -1,4 +1,4 @@ -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class HeatMetersSelection { diff --git a/TBF/TestWizard/HeatMetersSelection.cs b/TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs similarity index 97% rename from TBF/TestWizard/HeatMetersSelection.cs rename to TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs index 1d42bec68..31b9e9c2b 100644 --- a/TBF/TestWizard/HeatMetersSelection.cs +++ b/TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class HeatMetersSelection : Form { diff --git a/TBF/TestWizard/HeatMetersSelection.resx b/TBF/UI/Procedures/TestWizard/HeatMetersSelection.resx similarity index 100% rename from TBF/TestWizard/HeatMetersSelection.resx rename to TBF/UI/Procedures/TestWizard/HeatMetersSelection.resx diff --git a/TBF/TestWizard/MethodSelection.Designer.cs b/TBF/UI/Procedures/TestWizard/MethodSelection.Designer.cs similarity index 98% rename from TBF/TestWizard/MethodSelection.Designer.cs rename to TBF/UI/Procedures/TestWizard/MethodSelection.Designer.cs index 5f545530d..16bf244a8 100644 --- a/TBF/TestWizard/MethodSelection.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/MethodSelection.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class MethodSelection { diff --git a/TBF/TestWizard/MethodSelection.cs b/TBF/UI/Procedures/TestWizard/MethodSelection.cs similarity index 96% rename from TBF/TestWizard/MethodSelection.cs rename to TBF/UI/Procedures/TestWizard/MethodSelection.cs index a834b3526..f926d9400 100644 --- a/TBF/TestWizard/MethodSelection.cs +++ b/TBF/UI/Procedures/TestWizard/MethodSelection.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -12,7 +12,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class MethodSelection : Form { diff --git a/TBF/TestWizard/MethodSelection.resx b/TBF/UI/Procedures/TestWizard/MethodSelection.resx similarity index 100% rename from TBF/TestWizard/MethodSelection.resx rename to TBF/UI/Procedures/TestWizard/MethodSelection.resx diff --git a/TBF/TestWizard/PressureSelection.cs b/TBF/UI/Procedures/TestWizard/PressureSelection.cs similarity index 96% rename from TBF/TestWizard/PressureSelection.cs rename to TBF/UI/Procedures/TestWizard/PressureSelection.cs index aafef9d51..2ba8ed105 100644 --- a/TBF/TestWizard/PressureSelection.cs +++ b/TBF/UI/Procedures/TestWizard/PressureSelection.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Windows.Forms; using Config.Entities; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class PressureSelection : Form { diff --git a/TBF/TestWizard/PressureSelection.designer.cs b/TBF/UI/Procedures/TestWizard/PressureSelection.designer.cs similarity index 98% rename from TBF/TestWizard/PressureSelection.designer.cs rename to TBF/UI/Procedures/TestWizard/PressureSelection.designer.cs index e78ea4935..8ef6606e7 100644 --- a/TBF/TestWizard/PressureSelection.designer.cs +++ b/TBF/UI/Procedures/TestWizard/PressureSelection.designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class PressureSelection { diff --git a/TBF/TestWizard/PressureSelection.resx b/TBF/UI/Procedures/TestWizard/PressureSelection.resx similarity index 100% rename from TBF/TestWizard/PressureSelection.resx rename to TBF/UI/Procedures/TestWizard/PressureSelection.resx diff --git a/TBF/TestWizard/Roi1.Designer.cs b/TBF/UI/Procedures/TestWizard/Roi1.Designer.cs similarity index 98% rename from TBF/TestWizard/Roi1.Designer.cs rename to TBF/UI/Procedures/TestWizard/Roi1.Designer.cs index 2e9340799..3f860bddd 100644 --- a/TBF/TestWizard/Roi1.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/Roi1.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class Roi1 { diff --git a/TBF/TestWizard/Roi1.cs b/TBF/UI/Procedures/TestWizard/Roi1.cs similarity index 97% rename from TBF/TestWizard/Roi1.cs rename to TBF/UI/Procedures/TestWizard/Roi1.cs index dc412d961..17945e526 100644 --- a/TBF/TestWizard/Roi1.cs +++ b/TBF/UI/Procedures/TestWizard/Roi1.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// using System; using System.Drawing; using System.Windows.Forms; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class Roi1 : Form { diff --git a/TBF/TestWizard/Roi1.resx b/TBF/UI/Procedures/TestWizard/Roi1.resx similarity index 100% rename from TBF/TestWizard/Roi1.resx rename to TBF/UI/Procedures/TestWizard/Roi1.resx diff --git a/TBF/TestWizard/Roi2.Designer.cs b/TBF/UI/Procedures/TestWizard/Roi2.Designer.cs similarity index 98% rename from TBF/TestWizard/Roi2.Designer.cs rename to TBF/UI/Procedures/TestWizard/Roi2.Designer.cs index d96d228c7..3e84882ee 100644 --- a/TBF/TestWizard/Roi2.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/Roi2.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class Roi2 { diff --git a/TBF/TestWizard/Roi2.cs b/TBF/UI/Procedures/TestWizard/Roi2.cs similarity index 95% rename from TBF/TestWizard/Roi2.cs rename to TBF/UI/Procedures/TestWizard/Roi2.cs index d7d40c57f..a920b5202 100644 --- a/TBF/TestWizard/Roi2.cs +++ b/TBF/UI/Procedures/TestWizard/Roi2.cs @@ -1,11 +1,11 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// using System; using System.Windows.Forms; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class Roi2 : Form { diff --git a/TBF/TestWizard/Roi2.resx b/TBF/UI/Procedures/TestWizard/Roi2.resx similarity index 100% rename from TBF/TestWizard/Roi2.resx rename to TBF/UI/Procedures/TestWizard/Roi2.resx diff --git a/TBF/TestWizard/Roi3.Designer.cs b/TBF/UI/Procedures/TestWizard/Roi3.Designer.cs similarity index 98% rename from TBF/TestWizard/Roi3.Designer.cs rename to TBF/UI/Procedures/TestWizard/Roi3.Designer.cs index 910bcbc61..a69ff8903 100644 --- a/TBF/TestWizard/Roi3.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/Roi3.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class Roi3 { diff --git a/TBF/TestWizard/Roi3.cs b/TBF/UI/Procedures/TestWizard/Roi3.cs similarity index 96% rename from TBF/TestWizard/Roi3.cs rename to TBF/UI/Procedures/TestWizard/Roi3.cs index 1960eb930..ce0ca0529 100644 --- a/TBF/TestWizard/Roi3.cs +++ b/TBF/UI/Procedures/TestWizard/Roi3.cs @@ -1,11 +1,11 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// using System; using System.Windows.Forms; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class Roi3 : Form { diff --git a/TBF/TestWizard/Roi3.resx b/TBF/UI/Procedures/TestWizard/Roi3.resx similarity index 100% rename from TBF/TestWizard/Roi3.resx rename to TBF/UI/Procedures/TestWizard/Roi3.resx diff --git a/TBF/TestWizard/RoiData.cs b/TBF/UI/Procedures/TestWizard/RoiData.cs similarity index 94% rename from TBF/TestWizard/RoiData.cs rename to TBF/UI/Procedures/TestWizard/RoiData.cs index a46a69e9e..a3368fc37 100644 --- a/TBF/TestWizard/RoiData.cs +++ b/TBF/UI/Procedures/TestWizard/RoiData.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2017 Sensus Metering Systems +/// Copyright (c) 2017 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public enum TurningDirection { diff --git a/TBF/TestWizard/VolumeAndErrorSelection.Designer.cs b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.Designer.cs similarity index 99% rename from TBF/TestWizard/VolumeAndErrorSelection.Designer.cs rename to TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.Designer.cs index 1b3dcc360..9a12eba62 100644 --- a/TBF/TestWizard/VolumeAndErrorSelection.Designer.cs +++ b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { partial class VolumeAndErrorSelection { diff --git a/TBF/TestWizard/VolumeAndErrorSelection.cs b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs similarity index 98% rename from TBF/TestWizard/VolumeAndErrorSelection.cs rename to TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs index c16c3b062..6310b1ecb 100644 --- a/TBF/TestWizard/VolumeAndErrorSelection.cs +++ b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Senus Slovensko a.s. /// using System; using System.Windows.Forms; using Config.Entities; using TBF.Resources; -namespace TBF.TestWizard +namespace TBF.UI.Procedures.TestWizard { public partial class VolumeAndErrorSelection : Form { diff --git a/TBF/TestWizard/VolumeAndErrorSelection.resx b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.resx similarity index 100% rename from TBF/TestWizard/VolumeAndErrorSelection.resx rename to TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.resx diff --git a/TBF/Screens/ProcessTabPageCtrl24.Designer.cs b/TBF/UI/Process/ProcessTabPageCtrl24.Designer.cs similarity index 99% rename from TBF/Screens/ProcessTabPageCtrl24.Designer.cs rename to TBF/UI/Process/ProcessTabPageCtrl24.Designer.cs index 1e8b5979e..10e7c81f8 100644 --- a/TBF/Screens/ProcessTabPageCtrl24.Designer.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl24.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2015 Sensus Metering Systems /// -namespace TBF.Screens +namespace TBF.UI.Process { partial class ProcessTabPageCtrl24 { diff --git a/TBF/Screens/ProcessTabPageCtrl24.cs b/TBF/UI/Process/ProcessTabPageCtrl24.cs similarity index 97% rename from TBF/Screens/ProcessTabPageCtrl24.cs rename to TBF/UI/Process/ProcessTabPageCtrl24.cs index 23b064886..26d2e941e 100644 --- a/TBF/Screens/ProcessTabPageCtrl24.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl24.cs @@ -6,13 +6,14 @@ using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Entities; using TBF.BenchControl.Sequences; using TBF.UiBridge; using TBF.Resources; #pragma warning disable 162 /// Disables 'Unreachable code detected' warning -namespace TBF.Screens +namespace TBF.UI.Process { public partial class ProcessTabPageCtrl24 : UserControl { @@ -518,7 +519,7 @@ namespace TBF.Screens { if (args == null) return; - Results.Entities.TestRslt tRes = args.TestRslt; + TestRslt tRes = args.TestRslt; if (tRes == null) return; airTempLabel.Text = tRes.AmbTempMean.ToString("F1"); @@ -549,8 +550,8 @@ namespace TBF.Screens { for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.BatchRslts.WaterMeters.Length); i++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; - Results.Entities.MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; if (mtr != null) { @@ -566,12 +567,12 @@ namespace TBF.Screens { for (int compMtr = 0; compMtr < Config.Data.CompoundWMsCount; compMtr++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; if (wm == null) continue; int end = Math.Min(textBoxesCount, Config.Data.WMsCount); - Results.Entities.MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); + MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); if ((mtrMain != null) && (2 * compMtr < end)) { pulses[2 * compMtr].Text = mtrMain.PulsesMeter.ToString("F0"); @@ -581,7 +582,7 @@ namespace TBF.Screens passed[2 * compMtr].Text = mtrMain.Passed ? Strings.Passed : Strings.Failed; } - Results.Entities.MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); + MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); if ((mtrAux != null) && (2 * compMtr + 1 < end)) { pulses[2 * compMtr + 1].Text = mtrAux.PulsesMeter.ToString("F0"); @@ -591,7 +592,7 @@ namespace TBF.Screens passed[2 * compMtr + 1].Text = mtrAux.Passed ? Strings.Passed : Strings.Failed; } - Results.Entities.MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); + MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); if (mtrComp != null) { cmpndVolume[compMtr].Text = mtrComp.VolumeMeter.ToString("F2"); diff --git a/TBF/Screens/ProcessTabPageCtrl24.resx b/TBF/UI/Process/ProcessTabPageCtrl24.resx similarity index 100% rename from TBF/Screens/ProcessTabPageCtrl24.resx rename to TBF/UI/Process/ProcessTabPageCtrl24.resx diff --git a/TBF/Screens/ProcessTabPageCtrl48.Designer.cs b/TBF/UI/Process/ProcessTabPageCtrl48.Designer.cs similarity index 99% rename from TBF/Screens/ProcessTabPageCtrl48.Designer.cs rename to TBF/UI/Process/ProcessTabPageCtrl48.Designer.cs index 950e6acc7..902274870 100644 --- a/TBF/Screens/ProcessTabPageCtrl48.Designer.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl48.Designer.cs @@ -2,7 +2,7 @@ /// Copyright (c) 2015 Sensus Metering Systems /// Author: Milan Hanajík /// -namespace TBF.Screens +namespace TBF.UI.Process { partial class ProcessTabPageCtrl48 { diff --git a/TBF/Screens/ProcessTabPageCtrl48.cs b/TBF/UI/Process/ProcessTabPageCtrl48.cs similarity index 97% rename from TBF/Screens/ProcessTabPageCtrl48.cs rename to TBF/UI/Process/ProcessTabPageCtrl48.cs index 2150eb2f4..d28684e62 100644 --- a/TBF/Screens/ProcessTabPageCtrl48.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl48.cs @@ -7,13 +7,14 @@ using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Entities; using TBF.BenchControl.Sequences; using TBF.UiBridge; using TBF.Resources; #pragma warning disable 162 /// Disables 'Unreachable code detected' warning -namespace TBF.Screens +namespace TBF.UI.Process { public partial class ProcessTabPageCtrl48 : UserControl { @@ -547,7 +548,7 @@ namespace TBF.Screens { if (args == null) return; - Results.Entities.TestRslt tRes = args.TestRslt; + TestRslt tRes = args.TestRslt; if (tRes == null) return; airTempLabel.Text = tRes.AmbTempMean.ToString("F1"); @@ -578,8 +579,8 @@ namespace TBF.Screens { for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.BatchRslts.WaterMeters.Length); i++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; - Results.Entities.MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; if (mtr != null) { @@ -595,12 +596,12 @@ namespace TBF.Screens { for (int compMtr = 0; compMtr < Config.Data.CompoundWMsCount; compMtr++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; if (wm == null) continue; int end = Math.Min(textBoxesCount, Config.Data.WMsCount); - Results.Entities.MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); + MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); if ((mtrMain != null) && (2 * compMtr < end)) { pulses[2 * compMtr].Text = mtrMain.PulsesMeter.ToString("F0"); @@ -610,7 +611,7 @@ namespace TBF.Screens passed[2 * compMtr].Text = mtrMain.Passed ? Strings.Passed : Strings.Failed; } - Results.Entities.MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); + MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); if ((mtrAux != null) && (2 * compMtr + 1 < end)) { pulses[2 * compMtr + 1].Text = mtrAux.PulsesMeter.ToString("F0"); @@ -620,7 +621,7 @@ namespace TBF.Screens passed[2 * compMtr + 1].Text = mtrAux.Passed ? Strings.Passed : Strings.Failed; } - Results.Entities.MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); + MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); if (mtrComp != null) { cmpndVolume[compMtr].Text = mtrComp.VolumeMeter.ToString("F2"); diff --git a/TBF/Screens/ProcessTabPageCtrl48.resx b/TBF/UI/Process/ProcessTabPageCtrl48.resx similarity index 100% rename from TBF/Screens/ProcessTabPageCtrl48.resx rename to TBF/UI/Process/ProcessTabPageCtrl48.resx diff --git a/TBF/Screens/ProcessTabPageCtrl6.Designer.cs b/TBF/UI/Process/ProcessTabPageCtrl6.Designer.cs similarity index 99% rename from TBF/Screens/ProcessTabPageCtrl6.Designer.cs rename to TBF/UI/Process/ProcessTabPageCtrl6.Designer.cs index 1cfb0c6ad..d86f19b7f 100644 --- a/TBF/Screens/ProcessTabPageCtrl6.Designer.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl6.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2015 Sensus Metering Systems /// -namespace TBF.Screens +namespace TBF.UI.Process { partial class ProcessTabPageCtrl6 { diff --git a/TBF/Screens/ProcessTabPageCtrl6.cs b/TBF/UI/Process/ProcessTabPageCtrl6.cs similarity index 97% rename from TBF/Screens/ProcessTabPageCtrl6.cs rename to TBF/UI/Process/ProcessTabPageCtrl6.cs index 74640601a..5b4653f8f 100644 --- a/TBF/Screens/ProcessTabPageCtrl6.cs +++ b/TBF/UI/Process/ProcessTabPageCtrl6.cs @@ -6,13 +6,14 @@ using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Entities; using TBF.BenchControl.Sequences; using TBF.UiBridge; using TBF.Resources; #pragma warning disable 162 /// Disables 'Unreachable code detected' warning -namespace TBF.Screens +namespace TBF.UI.Process { public partial class ProcessTabPageCtrl6 : UserControl { @@ -551,7 +552,7 @@ namespace TBF.Screens { if (args == null) return; - Results.Entities.TestRslt tRes = args.TestRslt; + TestRslt tRes = args.TestRslt; if (tRes == null) return; airTempLabel.Text = tRes.AmbTempMean.ToString("F1"); @@ -582,8 +583,8 @@ namespace TBF.Screens { for (int i = 0; i < Math.Min(textBoxesCount, ProcessData.BatchRslts.WaterMeters.Length); i++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; - Results.Entities.MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; if (mtr != null) { @@ -599,12 +600,12 @@ namespace TBF.Screens { for (int compMtr = 0; compMtr < Config.Data.CompoundWMsCount; compMtr++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[compMtr]; if (wm == null) continue; int end = Math.Min(textBoxesCount, Config.Data.WMsCount); - Results.Entities.MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); + MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); if ((mtrMain != null) && (2 * compMtr < end)) { pulses[2 * compMtr].Text = mtrMain.PulsesMeter.ToString("F0"); @@ -614,7 +615,7 @@ namespace TBF.Screens passed[2 * compMtr].Text = mtrMain.Passed ? Strings.Passed : Strings.Failed; } - Results.Entities.MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); + MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); if ((mtrAux != null) && (2 * compMtr + 1 < end)) { pulses[2 * compMtr + 1].Text = mtrAux.PulsesMeter.ToString("F0"); @@ -624,7 +625,7 @@ namespace TBF.Screens passed[2 * compMtr + 1].Text = mtrAux.Passed ? Strings.Passed : Strings.Failed; } - Results.Entities.MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); + MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); if (mtrComp != null) { cmpndVolume[compMtr].Text = mtrComp.VolumeMeter.ToString("F2"); diff --git a/TBF/Screens/ProcessTabPageCtrl6.resx b/TBF/UI/Process/ProcessTabPageCtrl6.resx similarity index 100% rename from TBF/Screens/ProcessTabPageCtrl6.resx rename to TBF/UI/Process/ProcessTabPageCtrl6.resx diff --git a/TBF/Screens/ProcessTabPageExCtrl.Designer.cs b/TBF/UI/Process/ProcessTabPageExCtrl.Designer.cs similarity index 99% rename from TBF/Screens/ProcessTabPageExCtrl.Designer.cs rename to TBF/UI/Process/ProcessTabPageExCtrl.Designer.cs index 93f5f54f5..c9f48ac8b 100644 --- a/TBF/Screens/ProcessTabPageExCtrl.Designer.cs +++ b/TBF/UI/Process/ProcessTabPageExCtrl.Designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2019 Sensus Slovensko a.s. /// -namespace TBF.Screens +namespace TBF.UI.Process { partial class ProcessTabPageExCtrl { diff --git a/TBF/Screens/ProcessTabPageExCtrl.cs b/TBF/UI/Process/ProcessTabPageExCtrl.cs similarity index 96% rename from TBF/Screens/ProcessTabPageExCtrl.cs rename to TBF/UI/Process/ProcessTabPageExCtrl.cs index c0d27d33d..a8b207c55 100644 --- a/TBF/Screens/ProcessTabPageExCtrl.cs +++ b/TBF/UI/Process/ProcessTabPageExCtrl.cs @@ -6,13 +6,14 @@ using System.Drawing; using System.Windows.Forms; using log4net; using Config.Entities; +using Results.Entities; using TBF.BenchControl.Sequences; using TBF.UiBridge; using TBF.Resources; #pragma warning disable 162 /// Disables 'Unreachable code detected' warning -namespace TBF.Screens +namespace TBF.UI.Process { public partial class ProcessTabPageExCtrl : UserControl { @@ -527,7 +528,7 @@ namespace TBF.Screens { if (args == null) return; - Results.Entities.TestRslt tRes = args.TestRslt; + TestRslt tRes = args.TestRslt; if (tRes == null) return; /// Pressure may change faster then temperature, therefore it is updated also here @@ -554,8 +555,8 @@ namespace TBF.Screens /// for (int i = 0; i < Math.Min(metersListView.Items.Count, ProcessData.BatchRslts.WaterMeters.Length); i++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; - Results.Entities.MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + MeterTestRslt mtr = (wm != null) ? wm.GetMeterTestRslt(args.TestName) : null; if (mtr != null) { @@ -574,11 +575,11 @@ namespace TBF.Screens /// for (int i = 0; i < Math.Min(metersListView.Items.Count, ProcessData.BatchRslts.WaterMeters.Length); i++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[i]; if (wm == null) continue; - Results.Entities.MeterTestRslt mtrVolume = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.HeatMeterVolume); - Results.Entities.MeterTestRslt mtrEnergy = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.HeatMeterEnergy); + MeterTestRslt mtrVolume = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.HeatMeterVolume); + MeterTestRslt mtrEnergy = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.HeatMeterEnergy); if (mtrVolume != null) { @@ -604,12 +605,12 @@ namespace TBF.Screens /// for (int z = 0; z < Math.Min(Config.Data.CompoundWMsCount, metersListView.Items.Count / 3); z++) { - Results.Entities.WaterMeter wm = ProcessData.BatchRslts.WaterMeters[z]; + WaterMeter wm = ProcessData.BatchRslts.WaterMeters[z]; if (wm == null) continue; - Results.Entities.MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); - Results.Entities.MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); - Results.Entities.MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); + MeterTestRslt mtrComp = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.Compound); + MeterTestRslt mtrMain = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundMain); + MeterTestRslt mtrAux = wm.GetMeterTestRslt(args.TestName, CompoundMeterId.CompoundAux); if (mtrComp != null) { diff --git a/TBF/Screens/ProcessTabPageExCtrl.resx b/TBF/UI/Process/ProcessTabPageExCtrl.resx similarity index 100% rename from TBF/Screens/ProcessTabPageExCtrl.resx rename to TBF/UI/Process/ProcessTabPageExCtrl.resx diff --git a/TBF/Forms/PreviousResultCtrl.Designer.cs b/TBF/UI/Results/PreviousResultCtrl.Designer.cs similarity index 99% rename from TBF/Forms/PreviousResultCtrl.Designer.cs rename to TBF/UI/Results/PreviousResultCtrl.Designer.cs index 7d48e08f7..35590b0f6 100644 --- a/TBF/Forms/PreviousResultCtrl.Designer.cs +++ b/TBF/UI/Results/PreviousResultCtrl.Designer.cs @@ -1,4 +1,4 @@ -namespace TBF.Forms +namespace TBF.UI.Results { partial class PreviousResultCtrl { diff --git a/TBF/Forms/PreviousResultCtrl.cs b/TBF/UI/Results/PreviousResultCtrl.cs similarity index 98% rename from TBF/Forms/PreviousResultCtrl.cs rename to TBF/UI/Results/PreviousResultCtrl.cs index 6d4f39e86..c382e5cd7 100644 --- a/TBF/Forms/PreviousResultCtrl.cs +++ b/TBF/UI/Results/PreviousResultCtrl.cs @@ -1,11 +1,11 @@ /// -/// Copyright (c) 2016-2017 Sensus Metering Systems +/// Copyright (c) 2016-2017 Sensus Slovensko a.s. /// using System; using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Results { public partial class PreviousResultCtrl : UserControl { diff --git a/TBF/Forms/PreviousResultCtrl.resx b/TBF/UI/Results/PreviousResultCtrl.resx similarity index 100% rename from TBF/Forms/PreviousResultCtrl.resx rename to TBF/UI/Results/PreviousResultCtrl.resx diff --git a/TBF/Forms/PreviousResultIdEventArgs.cs b/TBF/UI/Results/PreviousResultIdEventArgs.cs similarity index 87% rename from TBF/Forms/PreviousResultIdEventArgs.cs rename to TBF/UI/Results/PreviousResultIdEventArgs.cs index 9e78204df..5c1e66be1 100644 --- a/TBF/Forms/PreviousResultIdEventArgs.cs +++ b/TBF/UI/Results/PreviousResultIdEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace TBF.Forms +namespace TBF.UI.Results { public class PreviousResultIdEventArgs : EventArgs { diff --git a/TBF/Forms/PreviousResultsDlg.Designer.cs b/TBF/UI/Results/PreviousResultsDlg.Designer.cs similarity index 99% rename from TBF/Forms/PreviousResultsDlg.Designer.cs rename to TBF/UI/Results/PreviousResultsDlg.Designer.cs index e444b128e..d9fff9b35 100644 --- a/TBF/Forms/PreviousResultsDlg.Designer.cs +++ b/TBF/UI/Results/PreviousResultsDlg.Designer.cs @@ -1,4 +1,4 @@ -namespace TBF.Forms +namespace TBF.UI.Results { partial class PreviousResultsDlg { diff --git a/TBF/Forms/PreviousResultsDlg.cs b/TBF/UI/Results/PreviousResultsDlg.cs similarity index 92% rename from TBF/Forms/PreviousResultsDlg.cs rename to TBF/UI/Results/PreviousResultsDlg.cs index 329910222..775749562 100644 --- a/TBF/Forms/PreviousResultsDlg.cs +++ b/TBF/UI/Results/PreviousResultsDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2016-2017 Sensus Metering Systems +/// Copyright (c) 2016-2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -7,11 +7,10 @@ using System.Windows.Forms; using Results.Entities; using NHibernate; using log4net; +using Results; using TBF.Resources; -using TBF.BenchControl.Output.DB.SensusOracle; -using Oracle.DataAccess.Client; -namespace TBF.Forms +namespace TBF.UI.Results { public enum PreviousResultsMode { @@ -61,7 +60,7 @@ namespace TBF.Forms { Localize(); - session = Results.DB.CreateSession(); + session = DB.CreateSession(); lastDisplayedBatchNr = currentBatchNr - 1; DrawBatches(lastDisplayedBatchNr - LinesCount + 1, lastDisplayedBatchNr); @@ -213,7 +212,7 @@ namespace TBF.Forms } foreach (var wm in b.WaterMeters) { - new Results.Output.Printers.Munich.MunichPrintDocument(docVersion, wm, Config.Entities.PageOrientation.Portrait).Print(); + new global::Results.Output.Printers.Munich.MunichPrintDocument(docVersion, wm, Config.Entities.PageOrientation.Portrait).Print(); } #endif } @@ -245,33 +244,33 @@ namespace TBF.Forms } /// Prepare result items - IList items = null; + IList items = null; foreach (var wm in b.WaterMeters) { if (wm != null) { if (wm.WaterMeterData.Compound) { - items = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_CombinedWM); + items = WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_CombinedWM); } else if (wm.WaterMeterData.HeatMeter) { - items = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_HeatM); + items = WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_HeatM); } else { - items = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_SingleWM); + items = WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_SingleWM); } break; } } - if (items == null) items = new List(); + if (items == null) items = new List(); /// Show dialog with results - Results.Forms.BatchResultsDlg dlg = new Results.Forms.BatchResultsDlg + global::Results.Forms.BatchResultsDlg dlg = new global::Results.Forms.BatchResultsDlg { Text = string.Format(Strings.Results_of_batch_0, b.BatchNr), - Results = Results.BatchResults.FromBatch(b), + Results = BatchResults.FromBatch(b), Items = items, PopupResultsLeft = Program.LocalSettings.PopupResultsLeft, PopupResultsTop = Program.LocalSettings.PopupResultsTop, diff --git a/TBF/Forms/PreviousResultsDlg.resx b/TBF/UI/Results/PreviousResultsDlg.resx similarity index 100% rename from TBF/Forms/PreviousResultsDlg.resx rename to TBF/UI/Results/PreviousResultsDlg.resx diff --git a/TBF/Forms/ResultsArrangementDlg.Designer.cs b/TBF/UI/Results/ResultsArrangementDlg.Designer.cs similarity index 98% rename from TBF/Forms/ResultsArrangementDlg.Designer.cs rename to TBF/UI/Results/ResultsArrangementDlg.Designer.cs index b2a71853a..a8e16075c 100644 --- a/TBF/Forms/ResultsArrangementDlg.Designer.cs +++ b/TBF/UI/Results/ResultsArrangementDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Results { partial class ResultsArrangementDlg { @@ -47,7 +47,7 @@ namespace TBF.Forms this.okButton = new System.Windows.Forms.Button(); this.cancelButton = new System.Windows.Forms.Button(); this.unlockButton = new System.Windows.Forms.Button(); - this.resultsConfigCtrl = new Results.Forms.ResultsConfigCtrl(); + this.resultsConfigCtrl = new global::Results.Forms.ResultsConfigCtrl(); this.testsArangementGroupBox.SuspendLayout(); this.metersArangementGroupBox.SuspendLayout(); this.SuspendLayout(); @@ -271,7 +271,7 @@ namespace TBF.Forms private System.Windows.Forms.Button unlockButton; private System.Windows.Forms.TextBox nrMetersTextBox; private System.Windows.Forms.Label nrMetersLabel; - private Results.Forms.ResultsConfigCtrl resultsConfigCtrl; + private global::Results.Forms.ResultsConfigCtrl resultsConfigCtrl; private System.Windows.Forms.TextBox minHeightTextBox; private System.Windows.Forms.Label minHeightLabel; private System.Windows.Forms.TextBox minWidthTextBox; diff --git a/TBF/Forms/ResultsArrangementDlg.cs b/TBF/UI/Results/ResultsArrangementDlg.cs similarity index 98% rename from TBF/Forms/ResultsArrangementDlg.cs rename to TBF/UI/Results/ResultsArrangementDlg.cs index 8c5ed95b8..830bddc1b 100644 --- a/TBF/Forms/ResultsArrangementDlg.cs +++ b/TBF/UI/Results/ResultsArrangementDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using Config.Entities; using Results; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Results { public partial class ResultsArrangementDlg : Form { diff --git a/TBF/Forms/ResultsArrangementDlg.resx b/TBF/UI/Results/ResultsArrangementDlg.resx similarity index 100% rename from TBF/Forms/ResultsArrangementDlg.resx rename to TBF/UI/Results/ResultsArrangementDlg.resx diff --git a/TBF/Screens/ResultsTabPageCtrl.Designer.cs b/TBF/UI/Results/ResultsTabPageCtrl.Designer.cs similarity index 99% rename from TBF/Screens/ResultsTabPageCtrl.Designer.cs rename to TBF/UI/Results/ResultsTabPageCtrl.Designer.cs index b9395086a..66787e41b 100644 --- a/TBF/Screens/ResultsTabPageCtrl.Designer.cs +++ b/TBF/UI/Results/ResultsTabPageCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.Screens +namespace TBF.UI.Results { partial class ResultsTabPageCtrl { diff --git a/TBF/Screens/ResultsTabPageCtrl.cs b/TBF/UI/Results/ResultsTabPageCtrl.cs similarity index 87% rename from TBF/Screens/ResultsTabPageCtrl.cs rename to TBF/UI/Results/ResultsTabPageCtrl.cs index 19db1d493..276100a57 100644 --- a/TBF/Screens/ResultsTabPageCtrl.cs +++ b/TBF/UI/Results/ResultsTabPageCtrl.cs @@ -4,19 +4,18 @@ using System; using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Text; using System.Windows.Forms; using log4net; -using Config; +using NHibernate; using Config.Entities; +using Results; +using Results.Forms; +using Results.Entities; +using TracingDB.Entities; using TBF.Resources; using TBF.UiBridge; -using Results.Forms; -using TracingDB.Entities; -using NHibernate; -namespace TBF.Screens +namespace TBF.UI.Results { public partial class ResultsTabPageCtrl : UserControl { @@ -39,12 +38,12 @@ namespace TBF.Screens public int MinWidth; public int MinHeight; - public IList RsltItems_Screen_SingleWM; - public IList RsltItems_Screen_CombinedWM; - public IList RsltItems_Screen_HeatM; + public IList RsltItems_Screen_SingleWM; + public IList RsltItems_Screen_CombinedWM; + public IList RsltItems_Screen_HeatM; MetersKind metersKind; - IList currentItems; + IList currentItems; IOneWMResultsCtrl[] wmRsltsCtrl; /// An array of controls with water meter results. IOneWMResultsCtrl firstEnabledControl; DateTime lastRedraw; @@ -64,7 +63,7 @@ namespace TBF.Screens wmRsltsCtrl = new IOneWMResultsCtrl[0]; /// No water meters displayed => array with zero length firstEnabledControl = null; /// No water meters displayed => firstListView is null - currentItems = new List(); + currentItems = new List(); nrGroups = 1; metersInOneGroup = 1; @@ -76,9 +75,9 @@ namespace TBF.Screens ShowDisabledPositions = Program.LocalSettings.ShowDisabledPositions; MinWidth = Program.LocalSettings.ResultsConfigMinWidth; MinHeight = Program.LocalSettings.ResultsConfigMinHeight; - RsltItems_Screen_SingleWM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_SingleWM); - RsltItems_Screen_CombinedWM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_CombinedWM); - RsltItems_Screen_HeatM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_HeatM); + RsltItems_Screen_SingleWM = WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_SingleWM); + RsltItems_Screen_CombinedWM = WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_CombinedWM); + RsltItems_Screen_HeatM = WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_HeatM); currentItems = GetRsltItems(metersKind); } @@ -119,11 +118,11 @@ namespace TBF.Screens void OnProcedureSelected(object sender, ProcedureSelectedEventArgs args) { - Results.BatchResults batchResults = TBF.BenchControl.Sequences.ProcessData.BatchRslts; + BatchResults batchResults = TBF.BenchControl.Sequences.ProcessData.BatchRslts; if ((batchResults != null) && (Program.LocalSettings != null)) { - Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters); + global::Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters); } if (IsLayoutChangedDueToData(batchResults)) CreateControlsAndFillPanel(batchResults); @@ -132,11 +131,11 @@ namespace TBF.Screens void OnTestCompleted(object sender, TestCompletedEventArgs args) { - Results.BatchResults batchResults = TBF.BenchControl.Sequences.ProcessData.BatchRslts; + BatchResults batchResults = TBF.BenchControl.Sequences.ProcessData.BatchRslts; if ((batchResults != null) && (Program.LocalSettings != null)) { - Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters); + global::Results.Utils.GetCounterStates(batchResults.Batch, Program.LocalSettings.Counters); } if (IsLayoutChangedDueToData(batchResults)) CreateControlsAndFillPanel(batchResults); @@ -185,7 +184,7 @@ namespace TBF.Screens #endif if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null)) { - Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters); + global::Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters); } CreateControlsAndFillPanel(TBF.BenchControl.Sequences.ProcessData.BatchRslts); @@ -193,9 +192,9 @@ namespace TBF.Screens } - IList GetRsltItems(MetersKind metersKind) + IList GetRsltItems(MetersKind metersKind) { - IList srcItems; + IList srcItems; switch (metersKind) { default: @@ -204,7 +203,7 @@ namespace TBF.Screens case MetersKind.HeatMeter: srcItems = RsltItems_Screen_HeatM; break; } - IList copiedItems = new List(); + IList copiedItems = new List(); if (srcItems != null) { foreach (var it in srcItems) copiedItems.Add(it.Clone()); @@ -218,7 +217,7 @@ namespace TBF.Screens /// private void configureButton_Click(object sender, EventArgs e) { - TBF.Forms.ResultsArrangementDlg dlg = new TBF.Forms.ResultsArrangementDlg(); + ResultsArrangementDlg dlg = new ResultsArrangementDlg(); dlg.MetersKind = metersKind; dlg.TestsArrangement = TestsArrangement; @@ -255,15 +254,15 @@ namespace TBF.Screens default: case MetersKind.Single: RsltItems_Screen_SingleWM = dlg.SelectedItems; - Program.LocalSettings.RsltItems_Screen_SingleWM = Results.WMeterRsltItemSpec.ToStrArray(RsltItems_Screen_SingleWM); + Program.LocalSettings.RsltItems_Screen_SingleWM = WMeterRsltItemSpec.ToStrArray(RsltItems_Screen_SingleWM); break; case MetersKind.Combined: RsltItems_Screen_CombinedWM = dlg.SelectedItems; - Program.LocalSettings.RsltItems_Screen_CombinedWM = Results.WMeterRsltItemSpec.ToStrArray(RsltItems_Screen_CombinedWM); + Program.LocalSettings.RsltItems_Screen_CombinedWM = WMeterRsltItemSpec.ToStrArray(RsltItems_Screen_CombinedWM); break; case MetersKind.HeatMeter: RsltItems_Screen_HeatM = dlg.SelectedItems; - Program.LocalSettings.RsltItems_Screen_HeatM = Results.WMeterRsltItemSpec.ToStrArray(RsltItems_Screen_HeatM); + Program.LocalSettings.RsltItems_Screen_HeatM = WMeterRsltItemSpec.ToStrArray(RsltItems_Screen_HeatM); break; } UpdateItems(dlg.SelectedItems); @@ -272,7 +271,7 @@ namespace TBF.Screens if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null)) { - Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters); + global::Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters); } if (isLayoutChangedDueToConfig) @@ -301,7 +300,7 @@ namespace TBF.Screens if ((TBF.BenchControl.Sequences.ProcessData.BatchRslts != null) && (Program.LocalSettings != null)) { - Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters); + global::Results.Utils.GetCounterStates(TBF.BenchControl.Sequences.ProcessData.BatchRslts.Batch, Program.LocalSettings.Counters); } UpdateColumnWidths(Program.LocalSettings.RsltsClmnWidths); @@ -312,25 +311,25 @@ namespace TBF.Screens /// private void showPreviousResultsButton_Click(object sender, EventArgs e) { - new TBF.Forms.PreviousResultsDlg().ShowDialog(); + new PreviousResultsDlg().ShowDialog(); } private void reloadPreviousResultsButton_Click(object sender, EventArgs e) { - new TBF.Forms.PreviousResultsDlg(TBF.Forms.PreviousResultsMode.Reload).ShowDialog(); + new PreviousResultsDlg(PreviousResultsMode.Reload).ShowDialog(); } private void fixPreviousResultsButton_Click(object sender, EventArgs e) { - new TBF.Forms.PreviousResultsDlg(TBF.Forms.PreviousResultsMode.Fix).ShowDialog(); + new PreviousResultsDlg(PreviousResultsMode.Fix).ShowDialog(); } /// /// Handle double-click inside a water meter results control /// - void OnDoubleClick(object sender, Results.Forms.WaterMeterEventArgs args) + void OnDoubleClick(object sender, WaterMeterEventArgs args) { int waterMetersCount = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters.Length; - Results.Entities.WaterMeter wm; + WaterMeter wm; if ((args.WMPosition <= 0) || (args.WMPosition > waterMetersCount) || ((wm = TBF.BenchControl.Sequences.ProcessData.BatchRslts.WaterMeters[args.WMPosition - 1]) == null)) { @@ -353,7 +352,7 @@ namespace TBF.Screens } - void UpdateItems(IList items) + void UpdateItems(IList items) { bool updateItems = false; if (currentItems.Count != items.Count) @@ -383,7 +382,7 @@ namespace TBF.Screens } - bool IsLayoutChangedDueToData(Results.BatchResults results) + bool IsLayoutChangedDueToData(BatchResults results) { if (results == null || results.WaterMeters == null || results.WaterMeters.Length == 0) { @@ -413,7 +412,7 @@ namespace TBF.Screens /// /// Re-draw the results. Apply new settings if they changed. /// - void CreateControlsAndFillPanel(Results.BatchResults results) + void CreateControlsAndFillPanel(BatchResults results) { if ((results == null) || (results.WMPositionsCount == 0)) { @@ -505,7 +504,7 @@ namespace TBF.Screens { if (InvokeRequired) { - Invoke(new EventHandler(OnDoubleClick), s, args); + Invoke(new EventHandler(OnDoubleClick), s, args); } else { @@ -529,7 +528,7 @@ namespace TBF.Screens } - void UpdateResults(Results.BatchResults batchResults) + void UpdateResults(BatchResults batchResults) { if ((batchResults != null) && (batchResults.WaterMeters != null)) { @@ -545,11 +544,11 @@ namespace TBF.Screens } - void ShowMoreWMResults(Results.Entities.WaterMeter wm) + void ShowMoreWMResults(WaterMeter wm) { if ((TracingDB.DB.SessionFactory == null) || string.IsNullOrEmpty(wm.SerialNr)) { - new Results.Forms.MoreWMResultsDlg(wm, null).ShowDialog(); + new MoreWMResultsDlg(wm, null).ShowDialog(); } else { @@ -582,7 +581,7 @@ namespace TBF.Screens } } - new Results.Forms.MoreWMResultsDlg(wm, refRecords).ShowDialog(); + new MoreWMResultsDlg(wm, refRecords).ShowDialog(); } } } diff --git a/TBF/Screens/ResultsTabPageCtrl.resx b/TBF/UI/Results/ResultsTabPageCtrl.resx similarity index 100% rename from TBF/Screens/ResultsTabPageCtrl.resx rename to TBF/UI/Results/ResultsTabPageCtrl.resx diff --git a/TBF/BenchesDlg.Designer.cs b/TBF/UI/Settings/BenchesDlg.Designer.cs similarity index 98% rename from TBF/BenchesDlg.Designer.cs rename to TBF/UI/Settings/BenchesDlg.Designer.cs index 12188a9f1..69ab8973f 100644 --- a/TBF/BenchesDlg.Designer.cs +++ b/TBF/UI/Settings/BenchesDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF +namespace TBF.UI.Settings { partial class BenchesDlg { diff --git a/TBF/BenchesDlg.cs b/TBF/UI/Settings/BenchesDlg.cs similarity index 89% rename from TBF/BenchesDlg.cs rename to TBF/UI/Settings/BenchesDlg.cs index 15e20d028..d068cf6ae 100644 --- a/TBF/BenchesDlg.cs +++ b/TBF/UI/Settings/BenchesDlg.cs @@ -5,7 +5,7 @@ using System; using System.Windows.Forms; using TBF.Resources; -namespace TBF +namespace TBF.UI.Settings { /// /// Dialog to edit local settings that specify database parameters (S1.2) @@ -64,9 +64,8 @@ namespace TBF private void addButton_Click(object sender, EventArgs e) { Config.DatabaseSettings bench = new Config.DatabaseSettings(); - Forms.DatabaseSettingsDlg dlg = new Forms.DatabaseSettingsDlg(bench, - Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString, - Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString); + DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(bench, Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString, + Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString); DialogResult dr = dlg.ShowDialog(); CurrentDBChanged |= dlg.CurrentDBChanged; if (dr == DialogResult.OK) @@ -105,9 +104,8 @@ namespace TBF Config.DatabaseSettings ori = localSettings.TestBenches[testBenchesListBox.SelectedIndex]; Config.DatabaseSettings bench = (Config.DatabaseSettings)ori.Clone(); - Forms.DatabaseSettingsDlg dlg = new Forms.DatabaseSettingsDlg(bench, - Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString, - Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString); + DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(bench, Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString, + Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString); DialogResult dr = dlg.ShowDialog(); CurrentDBChanged |= dlg.CurrentDBChanged; if (dr == DialogResult.OK) @@ -135,9 +133,9 @@ namespace TBF { if (testBenchesListBox.SelectedIndex >= 0) { - Forms.DatabaseSettingsDlg dlg = new Forms.DatabaseSettingsDlg(localSettings.TestBenches[testBenchesListBox.SelectedIndex], - Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString, - Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString); + DatabaseSettingsDlg dlg = new DatabaseSettingsDlg(localSettings.TestBenches[testBenchesListBox.SelectedIndex], + Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString, + Config.Data.CurrentBench.WaterMetersDBSettings.ConnectionString); DialogResult dr = dlg.ShowDialog(); CurrentDBChanged |= dlg.CurrentDBChanged; if (dr == DialogResult.OK) diff --git a/TBF/BenchesDlg.resx b/TBF/UI/Settings/BenchesDlg.resx similarity index 100% rename from TBF/BenchesDlg.resx rename to TBF/UI/Settings/BenchesDlg.resx diff --git a/TBF/Forms/DatabaseSettingsDlg.Designer.cs b/TBF/UI/Settings/DatabaseSettingsDlg.Designer.cs similarity index 99% rename from TBF/Forms/DatabaseSettingsDlg.Designer.cs rename to TBF/UI/Settings/DatabaseSettingsDlg.Designer.cs index 23da3df25..7ba30a05e 100644 --- a/TBF/Forms/DatabaseSettingsDlg.Designer.cs +++ b/TBF/UI/Settings/DatabaseSettingsDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Settings { partial class DatabaseSettingsDlg { diff --git a/TBF/Forms/DatabaseSettingsDlg.cs b/TBF/UI/Settings/DatabaseSettingsDlg.cs similarity index 97% rename from TBF/Forms/DatabaseSettingsDlg.cs rename to TBF/UI/Settings/DatabaseSettingsDlg.cs index 81627d3da..4f6dcd442 100644 --- a/TBF/Forms/DatabaseSettingsDlg.cs +++ b/TBF/UI/Settings/DatabaseSettingsDlg.cs @@ -1,14 +1,14 @@ /// -/// Copyright (c) 2013-2019 Sensus Metering Systems +/// Copyright (c) 2013-2019 Sensus Slovensko a.s. /// using System; -using System.Diagnostics; using System.Drawing; using System.Windows.Forms; using log4net; +using Results; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Settings { /// /// Dialog to process test bench name and database settings (BenchSettings) @@ -224,9 +224,9 @@ namespace TBF.Forms log.ErrorFormat("Going to create an empty results database '{0}'", databaseName); ExecuteMySqlCmd(string.Format("DROP DATABASE `{0}`;", databaseName), userName); ExecuteMySqlCmd(string.Format("CREATE DATABASE `{0}`;", databaseName), userName); - Results.DB.DbType = bench.WaterMetersDBSettings.DbType; - Results.DB.ConnectionString = connectionString; - Results.DB.CreateEmptyDB(); + DB.DbType = bench.WaterMetersDBSettings.DbType; + DB.ConnectionString = connectionString; + DB.CreateEmptyDB(); log.ErrorFormat("An empty results database '{0}' was created", databaseName); MessageBox.Show(Strings.DB_was_successfully_created, Strings.Notification); @@ -312,12 +312,12 @@ namespace TBF.Forms } } - TBF.Forms.ModelessActivityForm form; + Shared.ModelessActivityForm form; System.Threading.Thread formThread; /// void DBImportMessageStart(string message) { - form = new TBF.Forms.ModelessActivityForm() + form = new Shared.ModelessActivityForm() { Message = message, FontFamily = "Arial", @@ -393,7 +393,7 @@ namespace TBF.Forms /// Database name void ExecuteMySqlCmd(string command, string userName, string databaseToBeUsed) { - Process proc = new Process(); + System.Diagnostics.Process proc = new System.Diagnostics.Process(); proc.StartInfo.FileName = @"C:\xampp\mysql\bin\mysql.exe"; if (string.IsNullOrEmpty(databaseToBeUsed)) @@ -412,7 +412,7 @@ namespace TBF.Forms proc.Start(); proc.StandardInput.WriteLine(command); - Debug.WriteLine(command); + System.Diagnostics.Debug.WriteLine(command); log.Warn(command); proc.StandardInput.WriteLine("exit"); proc.WaitForExit(); diff --git a/TBF/Forms/DatabaseSettingsDlg.resx b/TBF/UI/Settings/DatabaseSettingsDlg.resx similarity index 100% rename from TBF/Forms/DatabaseSettingsDlg.resx rename to TBF/UI/Settings/DatabaseSettingsDlg.resx diff --git a/TBF/PreferencesDlg.cs b/TBF/UI/Settings/LanguageDlg.cs similarity index 95% rename from TBF/PreferencesDlg.cs rename to TBF/UI/Settings/LanguageDlg.cs index 882278c61..d901e3899 100644 --- a/TBF/PreferencesDlg.cs +++ b/TBF/UI/Settings/LanguageDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -11,13 +11,13 @@ using System.Windows.Forms; using System.Globalization; using TBF.Resources; -namespace TBF +namespace TBF.UI.Settings { /// /// Dialog to edit local settings that specify UI preferences, language, etc. (S1.1) /// - public partial class PreferencesDlg : Form + public partial class LanguageDlg : Form { string[] LanguageName = new string[] { @@ -59,7 +59,7 @@ namespace TBF // when 'OK' is pressed. LocalSettings localSettings; - public PreferencesDlg() + public LanguageDlg() { Program.LocalSettings.Save(); localSettings = LocalSettings.Load(Program.LocalSettingsFileName); diff --git a/TBF/PreferencesDlg.Designer.cs b/TBF/UI/Settings/LanguageDlg.designer.cs similarity index 94% rename from TBF/PreferencesDlg.Designer.cs rename to TBF/UI/Settings/LanguageDlg.designer.cs index 59320f2a8..2deb3650c 100644 --- a/TBF/PreferencesDlg.Designer.cs +++ b/TBF/UI/Settings/LanguageDlg.designer.cs @@ -1,9 +1,9 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus slovensko a.s. /// -namespace TBF +namespace TBF.UI.Settings { - partial class PreferencesDlg + partial class LanguageDlg { /// /// Required designer variable. @@ -31,7 +31,7 @@ namespace TBF /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PreferencesDlg)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LanguageDlg)); this.okButton = new System.Windows.Forms.Button(); this.cancelButton = new System.Windows.Forms.Button(); this.languageListBox = new System.Windows.Forms.ListBox(); diff --git a/TBF/PreferencesDlg.resx b/TBF/UI/Settings/LanguageDlg.resx similarity index 100% rename from TBF/PreferencesDlg.resx rename to TBF/UI/Settings/LanguageDlg.resx diff --git a/TBF/Forms/UpgradeSelectionDlg.Designer.cs b/TBF/UI/Settings/UpgradeSelectionDlg.Designer.cs similarity index 99% rename from TBF/Forms/UpgradeSelectionDlg.Designer.cs rename to TBF/UI/Settings/UpgradeSelectionDlg.Designer.cs index f2f9cdaf2..9efd56c0e 100644 --- a/TBF/Forms/UpgradeSelectionDlg.Designer.cs +++ b/TBF/UI/Settings/UpgradeSelectionDlg.Designer.cs @@ -1,4 +1,4 @@ -namespace TBF.Forms +namespace TBF.UI.Settings { partial class UpgradeSelectionDlg { diff --git a/TBF/Forms/UpgradeSelectionDlg.cs b/TBF/UI/Settings/UpgradeSelectionDlg.cs similarity index 98% rename from TBF/Forms/UpgradeSelectionDlg.cs rename to TBF/UI/Settings/UpgradeSelectionDlg.cs index 15ad27388..a10d26f72 100644 --- a/TBF/Forms/UpgradeSelectionDlg.cs +++ b/TBF/UI/Settings/UpgradeSelectionDlg.cs @@ -5,11 +5,11 @@ using System.Collections.Generic; using log4net; using MySql.Data.MySqlClient; using NHibernate; +using Results; using Results.Entities; -using TBF.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Settings { public partial class UpgradeSelectionDlg : Form { @@ -18,7 +18,7 @@ namespace TBF.Forms int batchFrom; int batchTo; - TBF.Forms.ModelessActivityForm form; + Shared.ModelessActivityForm form; System.Threading.Thread formThread; public UpgradeSelectionDlg() @@ -37,7 +37,7 @@ namespace TBF.Forms void ActivityStart() { - form = new TBF.Forms.ModelessActivityForm() + form = new Shared.ModelessActivityForm() { Message = "Upgrading database", FontFamily = "Arial", @@ -166,7 +166,7 @@ namespace TBF.Forms ActivityStart(); if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) && - (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), resultsDbCommands))) + (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), resultsDbCommands))) { ActivityEnd(); MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -225,7 +225,7 @@ namespace TBF.Forms ActivityStart(); if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) && - (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), resultsDbCommands))) + (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), resultsDbCommands))) { if (upgradeConfigDBCheckBox.Checked) { @@ -349,7 +349,7 @@ namespace TBF.Forms ActivityStart(); if ((!upgradeConfigDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString), configDbCommands)) && - (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), resultsDbCommands))) + (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), resultsDbCommands))) { if (upgradeConfigDBCheckBox.Checked) { @@ -502,7 +502,7 @@ namespace TBF.Forms ActivityStart(); - if (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), commands)) + if (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), commands)) { ActivityEnd(); MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -527,7 +527,7 @@ namespace TBF.Forms ActivityStart(); - if (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), commands)) + if (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), commands)) { ActivityEnd(); MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -577,7 +577,7 @@ namespace TBF.Forms ActivityStart(); - if (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(Results.DB.ConnectionString), commands)) + if (!upgradeResultsDBCheckBox.Checked || ExecuteCommands(new MySqlConnection(DB.ConnectionString), commands)) { ActivityEnd(); MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -605,7 +605,7 @@ namespace TBF.Forms try { - ISession session = Results.DB.CreateSession(); + ISession session = DB.CreateSession(); IList bFrom = session.QueryOver().Where(x => (x.BatchNr == batchFrom)).List(); IList bTo = session.QueryOver().Where(x => (x.BatchNr == batchTo)).List(); diff --git a/TBF/Forms/UpgradeSelectionDlg.resx b/TBF/UI/Settings/UpgradeSelectionDlg.resx similarity index 100% rename from TBF/Forms/UpgradeSelectionDlg.resx rename to TBF/UI/Settings/UpgradeSelectionDlg.resx diff --git a/TBF/UiControls/BaseWithListViewEx.cs b/TBF/UI/Shared/BaseWithListViewEx.cs similarity index 96% rename from TBF/UiControls/BaseWithListViewEx.cs rename to TBF/UI/Shared/BaseWithListViewEx.cs index 59597c7bc..afbc5c2d6 100644 --- a/TBF/UiControls/BaseWithListViewEx.cs +++ b/TBF/UI/Shared/BaseWithListViewEx.cs @@ -1,14 +1,15 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; +using Results.Forms; -namespace TBF.UiControls +namespace TBF.UI.Shared { - public class BaseWithListViewEx : Results.Forms.ListViewEx + public class BaseWithListViewEx : ListViewEx { /// /// List of items to be edited diff --git a/TBF/UiControls/BenchControlPanel.Designer.cs b/TBF/UI/Shared/BenchControlPanel.Designer.cs similarity index 99% rename from TBF/UiControls/BenchControlPanel.Designer.cs rename to TBF/UI/Shared/BenchControlPanel.Designer.cs index 3b96d7f15..9516080ab 100644 --- a/TBF/UiControls/BenchControlPanel.Designer.cs +++ b/TBF/UI/Shared/BenchControlPanel.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Shared { partial class BenchControlPanel { diff --git a/TBF/UiControls/BenchControlPanel.cs b/TBF/UI/Shared/BenchControlPanel.cs similarity index 99% rename from TBF/UiControls/BenchControlPanel.cs rename to TBF/UI/Shared/BenchControlPanel.cs index 2b1a18fde..c580619da 100644 --- a/TBF/UiControls/BenchControlPanel.cs +++ b/TBF/UI/Shared/BenchControlPanel.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -10,7 +10,7 @@ using Config.Entities; using TBF.UiBridge; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Shared { public partial class BenchControlPanel : UserControl { diff --git a/TBF/UiControls/BenchControlPanel.cs.resx b/TBF/UI/Shared/BenchControlPanel.cs.resx similarity index 100% rename from TBF/UiControls/BenchControlPanel.cs.resx rename to TBF/UI/Shared/BenchControlPanel.cs.resx diff --git a/TBF/UiControls/BenchControlPanel.de.resx b/TBF/UI/Shared/BenchControlPanel.de.resx similarity index 100% rename from TBF/UiControls/BenchControlPanel.de.resx rename to TBF/UI/Shared/BenchControlPanel.de.resx diff --git a/TBF/UiControls/BenchControlPanel.it.resx b/TBF/UI/Shared/BenchControlPanel.it.resx similarity index 100% rename from TBF/UiControls/BenchControlPanel.it.resx rename to TBF/UI/Shared/BenchControlPanel.it.resx diff --git a/TBF/UiControls/BenchControlPanel.pl.resx b/TBF/UI/Shared/BenchControlPanel.pl.resx similarity index 100% rename from TBF/UiControls/BenchControlPanel.pl.resx rename to TBF/UI/Shared/BenchControlPanel.pl.resx diff --git a/TBF/UiControls/BenchControlPanel.resx b/TBF/UI/Shared/BenchControlPanel.resx similarity index 100% rename from TBF/UiControls/BenchControlPanel.resx rename to TBF/UI/Shared/BenchControlPanel.resx diff --git a/TBF/Forms/ClosingTbfForm.Designer.cs b/TBF/UI/Shared/ClosingTbfForm.Designer.cs similarity index 99% rename from TBF/Forms/ClosingTbfForm.Designer.cs rename to TBF/UI/Shared/ClosingTbfForm.Designer.cs index 9537fbcbb..8c10c0aab 100644 --- a/TBF/Forms/ClosingTbfForm.Designer.cs +++ b/TBF/UI/Shared/ClosingTbfForm.Designer.cs @@ -1,4 +1,4 @@ -namespace TBF.Forms +namespace TBF.UI.Shared { partial class ClosingTbfForm { diff --git a/TBF/Forms/ClosingTbfForm.cs b/TBF/UI/Shared/ClosingTbfForm.cs similarity index 96% rename from TBF/Forms/ClosingTbfForm.cs rename to TBF/UI/Shared/ClosingTbfForm.cs index bbf484d4e..35bd869cc 100644 --- a/TBF/Forms/ClosingTbfForm.cs +++ b/TBF/UI/Shared/ClosingTbfForm.cs @@ -5,7 +5,7 @@ using System; using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class ClosingTbfForm : Form { diff --git a/TBF/Forms/ClosingTbfForm.resx b/TBF/UI/Shared/ClosingTbfForm.resx similarity index 100% rename from TBF/Forms/ClosingTbfForm.resx rename to TBF/UI/Shared/ClosingTbfForm.resx diff --git a/TBF/Forms/EmergencyStopForm.cs b/TBF/UI/Shared/EmergencyStopForm.cs similarity index 96% rename from TBF/Forms/EmergencyStopForm.cs rename to TBF/UI/Shared/EmergencyStopForm.cs index 0c4b37463..ad5c2d2bb 100644 --- a/TBF/Forms/EmergencyStopForm.cs +++ b/TBF/UI/Shared/EmergencyStopForm.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Drawing; using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class EmergencyStopForm : Form { diff --git a/TBF/Forms/EmergencyStopForm.designer.cs b/TBF/UI/Shared/EmergencyStopForm.designer.cs similarity index 97% rename from TBF/Forms/EmergencyStopForm.designer.cs rename to TBF/UI/Shared/EmergencyStopForm.designer.cs index 12a7314b2..b522ed36d 100644 --- a/TBF/Forms/EmergencyStopForm.designer.cs +++ b/TBF/UI/Shared/EmergencyStopForm.designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Shared { partial class EmergencyStopForm { diff --git a/TBF/Forms/EmergencyStopForm.resx b/TBF/UI/Shared/EmergencyStopForm.resx similarity index 100% rename from TBF/Forms/EmergencyStopForm.resx rename to TBF/UI/Shared/EmergencyStopForm.resx diff --git a/TBF/Forms/ErrorDlg.Designer.cs b/TBF/UI/Shared/ErrorDlg.Designer.cs similarity index 97% rename from TBF/Forms/ErrorDlg.Designer.cs rename to TBF/UI/Shared/ErrorDlg.Designer.cs index 5df33d817..be7fe0449 100644 --- a/TBF/Forms/ErrorDlg.Designer.cs +++ b/TBF/UI/Shared/ErrorDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Shared { partial class ErrorDlg diff --git a/TBF/Forms/ErrorDlg.cs b/TBF/UI/Shared/ErrorDlg.cs similarity index 93% rename from TBF/Forms/ErrorDlg.cs rename to TBF/UI/Shared/ErrorDlg.cs index 90e0be220..94839523b 100644 --- a/TBF/Forms/ErrorDlg.cs +++ b/TBF/UI/Shared/ErrorDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -10,10 +10,9 @@ using System.Linq; using System.Text; using System.Windows.Forms; using TBF; -using TBF.ErrorHandler; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class ErrorDlg : Form { diff --git a/TBF/Forms/ErrorDlg.resx b/TBF/UI/Shared/ErrorDlg.resx similarity index 100% rename from TBF/Forms/ErrorDlg.resx rename to TBF/UI/Shared/ErrorDlg.resx diff --git a/TBF/UiControls/IParentOfListViewEx.cs b/TBF/UI/Shared/IParentOfListViewEx.cs similarity index 62% rename from TBF/UiControls/IParentOfListViewEx.cs rename to TBF/UI/Shared/IParentOfListViewEx.cs index fb940ce90..63d74d6a0 100644 --- a/TBF/UiControls/IParentOfListViewEx.cs +++ b/TBF/UI/Shared/IParentOfListViewEx.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Shared { interface IParentOfListViewEx { diff --git a/TBF/UiControls/ITabWithListViewEx.cs b/TBF/UI/Shared/ITabWithListViewEx.cs similarity index 85% rename from TBF/UiControls/ITabWithListViewEx.cs rename to TBF/UI/Shared/ITabWithListViewEx.cs index 500e97949..de9b6e5cc 100644 --- a/TBF/UiControls/ITabWithListViewEx.cs +++ b/TBF/UI/Shared/ITabWithListViewEx.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2017 Senus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Linq; using System.Text; -namespace TBF.UiControls +namespace TBF.UI.Shared { interface ITabWithListViewEx { diff --git a/TBF/Forms/LoginDlgWithBenchSelection.cs b/TBF/UI/Shared/LoginDlgWithBenchSelection.cs similarity index 99% rename from TBF/Forms/LoginDlgWithBenchSelection.cs rename to TBF/UI/Shared/LoginDlgWithBenchSelection.cs index fc05f0dfd..dfd685061 100644 --- a/TBF/Forms/LoginDlgWithBenchSelection.cs +++ b/TBF/UI/Shared/LoginDlgWithBenchSelection.cs @@ -8,7 +8,7 @@ using GemCard; using System.Drawing; -namespace TBF.Forms +namespace TBF.UI.Shared { /// /// Provides login dialog that includes test bench selection. diff --git a/TBF/Forms/LoginDlgWithBenchSelection.designer.cs b/TBF/UI/Shared/LoginDlgWithBenchSelection.designer.cs similarity index 98% rename from TBF/Forms/LoginDlgWithBenchSelection.designer.cs rename to TBF/UI/Shared/LoginDlgWithBenchSelection.designer.cs index 877f8ddfd..ab74b5417 100644 --- a/TBF/Forms/LoginDlgWithBenchSelection.designer.cs +++ b/TBF/UI/Shared/LoginDlgWithBenchSelection.designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2016 Senus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Shared { partial class LoginDlgWithBenchSelection { diff --git a/TBF/Forms/LoginDlgWithBenchSelection.resx b/TBF/UI/Shared/LoginDlgWithBenchSelection.resx similarity index 100% rename from TBF/Forms/LoginDlgWithBenchSelection.resx rename to TBF/UI/Shared/LoginDlgWithBenchSelection.resx diff --git a/TBF/Forms/ModelessActivityForm.cs b/TBF/UI/Shared/ModelessActivityForm.cs similarity index 99% rename from TBF/Forms/ModelessActivityForm.cs rename to TBF/UI/Shared/ModelessActivityForm.cs index fc3c9c60f..d12978769 100644 --- a/TBF/Forms/ModelessActivityForm.cs +++ b/TBF/UI/Shared/ModelessActivityForm.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Windows.Forms; using TBF.UiBridge; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class ModelessActivityForm : Form { diff --git a/TBF/Forms/ModelessActivityForm.designer.cs b/TBF/UI/Shared/ModelessActivityForm.designer.cs similarity index 99% rename from TBF/Forms/ModelessActivityForm.designer.cs rename to TBF/UI/Shared/ModelessActivityForm.designer.cs index 51fbf55de..08016807d 100644 --- a/TBF/Forms/ModelessActivityForm.designer.cs +++ b/TBF/UI/Shared/ModelessActivityForm.designer.cs @@ -1,4 +1,4 @@ -namespace TBF.Forms +namespace TBF.UI.Shared { partial class ModelessActivityForm { diff --git a/TBF/Forms/ModelessActivityForm.resx b/TBF/UI/Shared/ModelessActivityForm.resx similarity index 100% rename from TBF/Forms/ModelessActivityForm.resx rename to TBF/UI/Shared/ModelessActivityForm.resx diff --git a/TBF/Forms/NoBenchOrDatabaseDlg.Designer.cs b/TBF/UI/Shared/NoBenchOrDatabaseDlg.Designer.cs similarity index 98% rename from TBF/Forms/NoBenchOrDatabaseDlg.Designer.cs rename to TBF/UI/Shared/NoBenchOrDatabaseDlg.Designer.cs index f60ec60a5..6a558f9c4 100644 --- a/TBF/Forms/NoBenchOrDatabaseDlg.Designer.cs +++ b/TBF/UI/Shared/NoBenchOrDatabaseDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Shared { partial class NoBenchOrDatabaseDlg { diff --git a/TBF/Forms/NoBenchOrDatabaseDlg.cs b/TBF/UI/Shared/NoBenchOrDatabaseDlg.cs similarity index 95% rename from TBF/Forms/NoBenchOrDatabaseDlg.cs rename to TBF/UI/Shared/NoBenchOrDatabaseDlg.cs index b33a7d8fb..d7f2a081d 100644 --- a/TBF/Forms/NoBenchOrDatabaseDlg.cs +++ b/TBF/UI/Shared/NoBenchOrDatabaseDlg.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Text; using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class NoBenchOrDatabaseDlg : Form { diff --git a/TBF/Forms/NoBenchOrDatabaseDlg.resx b/TBF/UI/Shared/NoBenchOrDatabaseDlg.resx similarity index 100% rename from TBF/Forms/NoBenchOrDatabaseDlg.resx rename to TBF/UI/Shared/NoBenchOrDatabaseDlg.resx diff --git a/TBF/Forms/PrintOrderForm.Designer.cs b/TBF/UI/Shared/PrintOrderForm.Designer.cs similarity index 98% rename from TBF/Forms/PrintOrderForm.Designer.cs rename to TBF/UI/Shared/PrintOrderForm.Designer.cs index 322f0c69d..25d51a5c8 100644 --- a/TBF/Forms/PrintOrderForm.Designer.cs +++ b/TBF/UI/Shared/PrintOrderForm.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Shared { partial class PrintOrderForm { diff --git a/TBF/Forms/PrintOrderForm.cs b/TBF/UI/Shared/PrintOrderForm.cs similarity index 97% rename from TBF/Forms/PrintOrderForm.cs rename to TBF/UI/Shared/PrintOrderForm.cs index b42d406db..44b2f5781 100644 --- a/TBF/Forms/PrintOrderForm.cs +++ b/TBF/UI/Shared/PrintOrderForm.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Text; using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class PrintOrderForm : Form { diff --git a/TBF/Forms/PrintOrderForm.resx b/TBF/UI/Shared/PrintOrderForm.resx similarity index 100% rename from TBF/Forms/PrintOrderForm.resx rename to TBF/UI/Shared/PrintOrderForm.resx diff --git a/TBF/Forms/RemarkDlg.Designer.cs b/TBF/UI/Shared/RemarkDlg.Designer.cs similarity index 99% rename from TBF/Forms/RemarkDlg.Designer.cs rename to TBF/UI/Shared/RemarkDlg.Designer.cs index 5eba0ae26..fe78e51d6 100644 --- a/TBF/Forms/RemarkDlg.Designer.cs +++ b/TBF/UI/Shared/RemarkDlg.Designer.cs @@ -1,4 +1,4 @@ -namespace TBF.Forms +namespace TBF.UI.Shared { partial class RemarkDlg { diff --git a/TBF/Forms/RemarkDlg.cs b/TBF/UI/Shared/RemarkDlg.cs similarity index 95% rename from TBF/Forms/RemarkDlg.cs rename to TBF/UI/Shared/RemarkDlg.cs index b791aa3df..12dbd814f 100644 --- a/TBF/Forms/RemarkDlg.cs +++ b/TBF/UI/Shared/RemarkDlg.cs @@ -2,7 +2,7 @@ using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class RemarkDlg : Form { diff --git a/TBF/Forms/RemarkDlg.resx b/TBF/UI/Shared/RemarkDlg.resx similarity index 100% rename from TBF/Forms/RemarkDlg.resx rename to TBF/UI/Shared/RemarkDlg.resx diff --git a/TBF/UiControls/SharedButtons.Designer.cs b/TBF/UI/Shared/SharedButtons.Designer.cs similarity index 99% rename from TBF/UiControls/SharedButtons.Designer.cs rename to TBF/UI/Shared/SharedButtons.Designer.cs index 2013b72e3..08e109d39 100644 --- a/TBF/UiControls/SharedButtons.Designer.cs +++ b/TBF/UI/Shared/SharedButtons.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Shared { partial class SharedButtons { diff --git a/TBF/UiControls/SharedButtons.cs b/TBF/UI/Shared/SharedButtons.cs similarity index 99% rename from TBF/UiControls/SharedButtons.cs rename to TBF/UI/Shared/SharedButtons.cs index dc75fe0ab..8d970bb36 100644 --- a/TBF/UiControls/SharedButtons.cs +++ b/TBF/UI/Shared/SharedButtons.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Windows.Forms; using Config.Entities; using TBF.Resources; -namespace TBF.UiControls +namespace TBF.UI.Shared { public partial class SharedButtons : UserControl { diff --git a/TBF/UiControls/SharedButtons.resx b/TBF/UI/Shared/SharedButtons.resx similarity index 100% rename from TBF/UiControls/SharedButtons.resx rename to TBF/UI/Shared/SharedButtons.resx diff --git a/TBF/Forms/TabNameDlg.Designer.cs b/TBF/UI/Shared/TabNameDlg.Designer.cs similarity index 98% rename from TBF/Forms/TabNameDlg.Designer.cs rename to TBF/UI/Shared/TabNameDlg.Designer.cs index 2be8db154..c16fc3217 100644 --- a/TBF/Forms/TabNameDlg.Designer.cs +++ b/TBF/UI/Shared/TabNameDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.Forms +namespace TBF.UI.Shared { partial class TabNameDlg { diff --git a/TBF/Forms/TabNameDlg.cs b/TBF/UI/Shared/TabNameDlg.cs similarity index 94% rename from TBF/Forms/TabNameDlg.cs rename to TBF/UI/Shared/TabNameDlg.cs index 925fc118c..58a557c41 100644 --- a/TBF/Forms/TabNameDlg.cs +++ b/TBF/UI/Shared/TabNameDlg.cs @@ -1,11 +1,11 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Windows.Forms; using TBF.Resources; -namespace TBF.Forms +namespace TBF.UI.Shared { public partial class TabNameDlg : Form { diff --git a/TBF/Forms/TabNameDlg.resx b/TBF/UI/Shared/TabNameDlg.resx similarity index 100% rename from TBF/Forms/TabNameDlg.resx rename to TBF/UI/Shared/TabNameDlg.resx diff --git a/TBF/UiControls/TestProgressCtrl.Designer.cs b/TBF/UI/Shared/TestProgressCtrl.Designer.cs similarity index 96% rename from TBF/UiControls/TestProgressCtrl.Designer.cs rename to TBF/UI/Shared/TestProgressCtrl.Designer.cs index 5cd08494c..b9dd28da9 100644 --- a/TBF/UiControls/TestProgressCtrl.Designer.cs +++ b/TBF/UI/Shared/TestProgressCtrl.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// -namespace TBF.UiControls +namespace TBF.UI.Shared { partial class TestProgressCtrl { diff --git a/TBF/UiControls/TestProgressCtrl.cs b/TBF/UI/Shared/TestProgressCtrl.cs similarity index 92% rename from TBF/UiControls/TestProgressCtrl.cs rename to TBF/UI/Shared/TestProgressCtrl.cs index 0c2decae9..502850f71 100644 --- a/TBF/UiControls/TestProgressCtrl.cs +++ b/TBF/UI/Shared/TestProgressCtrl.cs @@ -1,11 +1,11 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Senus Slovensko a.s. /// using System; using System.Drawing; using System.Windows.Forms; -namespace TBF.UiControls +namespace TBF.UI.Shared { public partial class TestProgressCtrl : UserControl { @@ -55,7 +55,7 @@ namespace TBF.UiControls { InitializeComponent(); this.Progress = 0; - this.TestResult = UiControls.TestProgressCtrl.Result.NotDone; + this.TestResult = TestProgressCtrl.Result.NotDone; } public TestProgressCtrl(int testId, string testName, int part, string title, int repetitionNr, int testRepeats) diff --git a/TBF/UiControls/TestProgressCtrl.resx b/TBF/UI/Shared/TestProgressCtrl.resx similarity index 100% rename from TBF/UiControls/TestProgressCtrl.resx rename to TBF/UI/Shared/TestProgressCtrl.resx diff --git a/TBF/TestProgressControls.cs b/TBF/UI/TestProgressControls.cs similarity index 86% rename from TBF/TestProgressControls.cs rename to TBF/UI/TestProgressControls.cs index 7117d49d4..15a00aa9d 100644 --- a/TBF/TestProgressControls.cs +++ b/TBF/UI/TestProgressControls.cs @@ -1,19 +1,20 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2015 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Windows.Forms; using TBF.UiBridge; using TBF.BenchControl; +using TBF.UI.Shared; -namespace TBF +namespace TBF.UI { public class TestProgressControls { System.Windows.Forms.Control parent; /// parent is progressFlowLayoutPanel of the only MainWnd instance - IList progresses; - UiControls.TestProgressCtrl currentProgress; + IList progresses; + TestProgressCtrl currentProgress; public TestProgressControls(Control parent) { @@ -80,7 +81,7 @@ namespace TBF currentProgress = null; parent.Controls.Clear(); - progresses = new List(); + progresses = new List(); bool isOuterLoopMode = false; int outerLoopRepeats = 0; @@ -118,9 +119,9 @@ namespace TBF break; } - string test2Name = Results.Utils.GetTestName(test2.Name, test2.Repeats, r); - UiControls.TestProgressCtrl progress = - new UiControls.TestProgressCtrl(test2.Id, test2Name, test2.Part, Utils.TestTitle(test2, r), r, test2.Repeats); + string test2Name = global::Results.Utils.GetTestName(test2.Name, test2.Repeats, r); + TestProgressCtrl progress = + new TestProgressCtrl(test2.Id, test2Name, test2.Part, Utils.TestTitle(test2, r), r, test2.Repeats); progresses.Add(progress); parent.Controls.Add(progress); Console.WriteLine(test2Name); @@ -128,9 +129,9 @@ namespace TBF } else { - string testName = Results.Utils.GetTestName(test.Name, test.Repeats, r); - UiControls.TestProgressCtrl progress = - new UiControls.TestProgressCtrl(test.Id, testName, test.Part, Utils.TestTitle(test, r), r, test.Repeats); + string testName = global::Results.Utils.GetTestName(test.Name, test.Repeats, r); + TestProgressCtrl progress = + new TestProgressCtrl(test.Id, testName, test.Part, Utils.TestTitle(test, r), r, test.Repeats); progresses.Add(progress); parent.Controls.Add(progress); Console.WriteLine(testName); @@ -164,7 +165,7 @@ namespace TBF { currentProgress = prgrs; currentProgress.Progress = 0; - currentProgress.TestResult = UiControls.TestProgressCtrl.Result.NotDone; + currentProgress.TestResult = TestProgressCtrl.Result.NotDone; return; } } @@ -199,7 +200,7 @@ namespace TBF // return; // } //} - currentProgress.TestResult = UiControls.TestProgressCtrl.Result.Failed; + currentProgress.TestResult = TestProgressCtrl.Result.Failed; } } diff --git a/TBF/UiControls/BenchControlPanel.ru.resx b/TBF/UiControls/BenchControlPanel.ru.resx deleted file mode 100644 index 07e812137..000000000 --- a/TBF/UiControls/BenchControlPanel.ru.resx +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Начать тест - - - Результаты - - - Вспомогательный - - - Тест камеры - - - Сброс - - - Конец - - - W1 - - - Начать - - - Q3 - - - W2 - - - Q1 - - - Запустить цикл - - - Очистка - - - Пустой - - - Следующий - - - Тест - - - Q2 - - - Принять - - - W3 - - - Стоп - - - Прервать - - - Чувствительность - - \ No newline at end of file diff --git a/TBF/UiControls/BenchControlPanel.zh-CN.resx b/TBF/UiControls/BenchControlPanel.zh-CN.resx deleted file mode 100644 index ff7ebe98f..000000000 --- a/TBF/UiControls/BenchControlPanel.zh-CN.resx +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 停止 - - - 开始测试 - - - 启动循环 - - - 开始 - - - 结束 - - - 断开 - - - 重置 - - - 相机测试 - - - 水箱 1 - - - 灵敏度 - - - 水箱 2 - - - 测试 - - - 清除 - - - 清空 - - - 下一个 - - - 辅助的 - - - 接受 - - - 结果 - - \ No newline at end of file